diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js
index 5f6d936d..be8fa661 100644
--- a/data/interfaces/default/js/tables/users.js
+++ b/data/interfaces/default/js/tables/users.js
@@ -1,6 +1,23 @@
 var users_to_delete = [];
 var users_to_purge = [];
 
+function toggleEditNames() {
+    if ($('.edit-control').hasClass('hidden')) {
+        $('.edit-user-control > .edit-user-name').each(function () {
+            a = $(this).children('a');
+            input = $(this).children('input');
+            a.text(input.val());
+            a.removeClass('hidden');
+            input.addClass('hidden');
+        });
+    } else {
+        $('.edit-user-control > .edit-user-name').each(function () {
+            $(this).children('a').addClass('hidden');
+            $(this).children('input').removeClass('hidden');
+        });
+    }
+}
+
 users_list_table_options = {
     "language": {
         "search": "Search: ",
@@ -217,6 +234,7 @@ users_list_table_options = {
             $('.edit-control').each(function () {
                 $(this).removeClass('hidden');
             });
+            toggleEditNames();
         }
     },
     "preDrawCallback": function(settings) {
diff --git a/data/interfaces/default/users.html b/data/interfaces/default/users.html
index 9b1a9dd1..bba7b7dd 100644
--- a/data/interfaces/default/users.html
+++ b/data/interfaces/default/users.html
@@ -156,14 +156,7 @@
                     $(this).addClass('hidden');
                     $('#row-edit-mode-alert').fadeOut(200);
                 });
-                $('.edit-user-control > .edit-user-name').each(function () {
-                    a = $(this).children('a');
-                    input = $(this).children('input');
-                    a.text(input.val());
-                    a.removeClass('hidden');
-                    input.addClass('hidden');
-                });
-
+                toggleEditNames();
             } else {
                 users_to_delete = [];
                 users_to_purge = [];
@@ -171,10 +164,7 @@
                     $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
                     $(this).removeClass('hidden');
                 });
-                $('.edit-user-control > .edit-user-name').each(function () {
-                    $(this).children('a').addClass('hidden');
-                    $(this).children('input').removeClass('hidden');
-                });
+                toggleEditNames();
             }
         });
     });