diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index f7948192500f787664d41d7bdab4dd10ebe5e235..ed9999760a96ebb3defec653455b1453d2efbe52 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -616,15 +616,16 @@ $(document).ready(function () {
 			.keypress(function (event) {
 				if (event.keyCode === 13) {
 					if ($(this).val().length > 0) {
-						if ($tr.find('div.avatardiv').length) {
-							$tr.find('.avatardiv').imageplaceholder(uid, displayName);
+						$div = $tr.find('div.avatardiv')
+						if ($div.length) {
+							$div.imageplaceholder(uid, displayName);
 						}
 						$.post(
 							OC.filePath('settings', 'ajax', 'changedisplayname.php'),
 							{username: uid, displayName: $(this).val()},
 							function (result) {
-								if (result && result.status==='success' && $tr.find('div.avatardiv').length){
-									$tr.find('.avatardiv').avatar(result.data.username, 32);
+								if (result && result.status==='success' && $div.length){
+									$div.avatar(result.data.username, 32);
 								}
 							}
 						);