diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css
index ff17b76a..3ccc11be 100644
--- a/data/interfaces/default/css/plexpy.css
+++ b/data/interfaces/default/css/plexpy.css
@@ -2196,6 +2196,9 @@ a .home-platforms-instance-list-oval:hover,
     color: #fff;
     cursor: pointer;
 }
+.edit-user-name > input[type='text'] {
+    margin: 0;
+}
 .popover {
     z-index: 2;
 }
diff --git a/data/interfaces/default/users.html b/data/interfaces/default/users.html
index fe35f072..b493f997 100644
--- a/data/interfaces/default/users.html
+++ b/data/interfaces/default/users.html
@@ -16,7 +16,7 @@
             <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
                 <i class="fa fa-pencil"></i> Edit mode
             </button>&nbsp
-            <div class="alert alert-danger alert-edit" role="alert" id="row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbspSelect rows to delete. Data is deleted upon exiting delete mode.</div>
+            <div class="alert alert-danger alert-edit" role="alert" id="row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbspSelect users to purge. Data is purged upon exiting edit mode.</div>
         </div>
     </div>
     <div class='table-card-back'>
@@ -119,6 +119,13 @@
                     $(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');
+                });
 
             } else {
                 users_to_purge = [];
@@ -126,6 +133,10 @@
                     $(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');
+                });
             }
         });
     });