diff --git a/settings/js/users.js b/settings/js/users.js
index 835f46f6ed..111e3040a3 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -305,7 +305,8 @@ $(document).ready(function () {
         event.stopPropagation();
         var img = $(this);
         var uid = img.parent().parent().attr('data-uid');
-        var input = $('<input type="text">');
+        var displayName = img.parent().parent().attr('data-displayName');
+        var input = $('<input type="text" value="'+displayName+'">');
         img.css('display', 'none');
         img.parent().children('span').replaceWith(input);
         input.focus();
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 2ba57fb4a7..6407b59883 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -91,7 +91,8 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 	</thead>
 	<tbody>
 		<?php foreach($_["users"] as $user): ?>
-		<tr data-uid="<?php echo $user["name"] ?>">
+		<tr data-uid="<?php echo $user["name"] ?>"
+			data-displayName="<?php echo $user["displayName"] ?>">
 			<td class="name"><?php echo $user["name"]; ?></td>
 			<td class="displayName"><span><?php echo $user["displayName"]; ?></span> <img class="svg action"
 				src="<?php echo image_path('core', 'actions/rename.svg')?>"