diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css
index ebbc2489..8b75c1db 100644
--- a/data/interfaces/default/css/plexpy.css
+++ b/data/interfaces/default/css/plexpy.css
@@ -1823,7 +1823,8 @@ a .home-platforms-instance-list-oval:hover,
 .button-bar {
     float: right;
 }
-.colvis-button-bar {
+.colvis-button-bar,
+.refresh-users-button {
     float: right;
 }
 .nav-settings,
diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js
index 8a5154df..0e9719db 100644
--- a/data/interfaces/default/js/tables/users.js
+++ b/data/interfaces/default/js/tables/users.js
@@ -1,3 +1,5 @@
+var users_to_purge = [];
+
 users_list_table_options = {
     "language": {
         "search": "Search: ",
@@ -187,6 +189,11 @@ users_list_table_options = {
     "preDrawCallback": function(settings) {
         var msg = "<div class='msg'><i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...</div>";
         showMsg(msg, false, false, 0)
+    },
+    "rowCallback": function (row, rowData) {
+        if ($.inArray(rowData['user_id'], users_to_purge) !== -1) {
+            $(row).find('button[data-id="' + rowData['user_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
+        }
     }
 }
 
@@ -271,9 +278,11 @@ $('#users_list_table').on('click', 'td.edit-control > .edit-user-toggles > butto
     var row = users_list_table.row(tr);
     var rowData = row.data();
 
-    if ($(this).hasClass('active')) {
-        $(this).toggleClass('btn-warning').toggleClass('btn-danger');
+    var index = $.inArray(rowData['user_id'], users_to_purge);
+    if (index === -1) {
+        users_to_purge.push(rowData['user_id']);
     } else {
-        $(this).toggleClass('btn-danger').toggleClass('btn-warning');
+        users_to_purge.splice(index, 1);
     }
+    $(this).toggleClass('btn-warning').toggleClass('btn-danger');
 });
\ No newline at end of file
diff --git a/data/interfaces/default/users.html b/data/interfaces/default/users.html
index df36a858..fe35f072 100644
--- a/data/interfaces/default/users.html
+++ b/data/interfaces/default/users.html
@@ -12,12 +12,11 @@
             <span><i class="fa fa-group"></i> All Users</span>
         </div>
         <div class="button-bar">
-            <span data-toggle="popover" data-placement="left" data-content="Data purging does not occur until after exiting edit mode." id="purge-message">
-                <button class="btn btn-dark" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
-                    <i class="fa fa-pencil"></i> Edit mode
-                </button>&nbsp
-            </span>
-            <button class="btn btn-dark" id="refresh-users-list"><i class="fa fa-refresh"></i> Refresh users</button>
+            <button class="btn btn-dark refresh-users-button" id="refresh-users-list"><i class="fa fa-refresh"></i> Refresh users</button>
+            <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>
     </div>
     <div class='table-card-back'>
@@ -85,20 +84,19 @@
 
         clearSearchButton('users_list_table', users_list_table);
 
-        var users_to_purge = [];
         $('#row-edit-mode').on('click', function () {
-            $('#purge-message').popover();
+            $('#row-edit-mode-alert').fadeIn(200);
+            $('#users-to-delete').html('');
 
             if ($(this).hasClass('active')) {
-                users_to_purge = [];
-                ul = $('#users-to-delete');
-                ul.html('');
-                $('.edit-control button.btn-danger').map(function () {
-                    users_to_purge.push($(this).attr('data-id'));
-                    ul.append('<li>' + $('div[data-id=' + $(this).attr('data-id') + '] > input').val() + '</li>')
-                });
                 if (users_to_purge.length > 0) {
-                    $('#users-to-delete').append
+                    $('.edit-control').each(function () {
+                        $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
+                    });
+
+                    for (var i = 0; i < users_to_purge.length; i++) {
+                        $('#users-to-delete').append('<li>' + $('div[data-id=' + users_to_purge[i] + '] > input').val() + '</li>');
+                    }
                     $('#confirm-modal').modal();
                     $('#confirm-modal').one('click', '#confirm-purge', function () {
                         for (var i = 0; i < users_to_purge.length; i++) {
@@ -118,35 +116,16 @@
                 }
 
                 $('.edit-control').each(function () {
-                    $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
                     $(this).addClass('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');
+                    $('#row-edit-mode-alert').fadeOut(200);
                 });
 
             } else {
+                users_to_purge = [];
                 $('.edit-control').each(function () {
+                    $(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');
-                });
-
-            }
-        });
-
-        $(window).resize(function () {
-            if ($('.popover').popover().is(':visible')) {
-                var popover = $('.popover');
-                popover.addClass("noTransition");
-                $('#purge-message').popover('show');
-                popover.removeClass("noTransition");
             }
         });
     });