diff --git a/dashboard-ui/edituser.html b/dashboard-ui/edituser.html
index e2ba57e5c5..5a6a0695f4 100644
--- a/dashboard-ui/edituser.html
+++ b/dashboard-ui/edituser.html
@@ -19,7 +19,6 @@
                         <li id="fldUserName">
                             <label for="txtUserName">Name: </label>
                             <input id="txtUserName" name="txtUserName" required="required" type="text" />
-                            <div id="fldIcons"></div>
                         </li>
                         <li id="fldMaxParentalRating" style="display: none;">
                             <label for="selectMaxParentalRating">Max parental rating:</label>
diff --git a/dashboard-ui/scripts/edituserpage.js b/dashboard-ui/scripts/edituserpage.js
index 1f4bcdf283..80a9ddeb46 100644
--- a/dashboard-ui/scripts/edituserpage.js
+++ b/dashboard-ui/scripts/edituserpage.js
@@ -85,12 +85,6 @@
         $('#chkForcedSubtitlesOnly', page).checked(user.Configuration.UseForcedSubtitlesOnly || false).checkboxradio("refresh");
         $('#chkIsAdmin', page).checked(user.Configuration.IsAdministrator || false).checkboxradio("refresh");
 
-        var userProfileIcons = '';
-        if (user.Configuration.HasPassword) userProfileIcons += '<img src="css/images/userdata/password.png" alt="Password" title="Password" class="userProfileIcon" />';
-        if (user.Configuration.IsAdministrator) userProfileIcons += '<img src="css/images/userdata/administrator.png" alt="Administrator" title="Administrator" class="userProfileIcon" />';
-
-        $('#fldIcons', page).html(userProfileIcons);
-
         Dashboard.hideLoadingMsg();
     },
 
diff --git a/dashboard-ui/scripts/userprofilespage.js b/dashboard-ui/scripts/userprofilespage.js
index 57e6f7c747..56295e9139 100644
--- a/dashboard-ui/scripts/userprofilespage.js
+++ b/dashboard-ui/scripts/userprofilespage.js
@@ -36,9 +36,12 @@
                 html += "<img src='css/images/userflyoutdefault.png' />";
             }
 
-            html += "<h3>" + user.Name + "</h3>";
+            html += "<h3>" + user.Name;
 
-            html += "</a>";
+            if (user.Configuration.HasPassword) html += '<img src="css/images/userdata/password.png" alt="Password" title="Password" class="userProfileIcon" />';
+            if (user.Configuration.IsAdministrator) html += '<img src="css/images/userdata/administrator.png" alt="Administrator" title="Administrator" class="userProfileIcon" />';
+
+            html += "</h3></a>";
 
             html += "<a onclick='UserProfilesPage.deleteUser(this);' data-userid='" + user.Id + "' data-username='" + user.Name + "' href='#'>Delete</a>";