diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index d0869cb8404..03e55594d67 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -34,7 +34,7 @@
 
 			<ul id="settings" class="svg">
 				<span id="expand">
-					<?php echo $_['displayname'] ?>
+					<span id="expandDisplayName"><?php echo $_['displayname'] ?></span>
 					<img class="svg" src="<?php echo image_path('', 'actions/caret.svg'); ?>" />
 				</span>
 				<div id="expanddiv">
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 8747c496041..4c8b2542b56 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -44,9 +44,7 @@ $(document).ready(function(){
 					$('#displaynamechanged').show();
 					$('#oldDisplayName').val($('#displayName').val());
 					// update displayName on the top right expand button
-					str_parts = $('#expand').html().split('\t');
-					str_parts[5] = $('#displayName').val();
-					$('#expand').html(str_parts.join('\t'));
+					$('#expandDisplayName').html($('#displayName').val());
 				}
 				else{
 					$('#newdisplayname').val(data.data.displayName)