diff --git a/webadmin/src/views/users.html b/webadmin/src/views/users.html
index 5cc7911b5..170d28d06 100644
--- a/webadmin/src/views/users.html
+++ b/webadmin/src/views/users.html
@@ -66,12 +66,12 @@
                 <form name="userremove_form" role="form" ng-submit="doUserRemove()" autocomplete="off">
                     <input type="password" style="display: none;">
                     <div class="form-group" ng-class="{ 'has-error': (userremove_form.username.$dirty && userremove_form.username.$invalid) || (!userremove_form.username.$dirty && userremove.error.username) }">
-                        <label class="control-label">Just to be sure you really want to delete this user, please type the user's name</label>
+                        <label class="control-label">Just to be sure you really want to delete this user, please type the username or email</label>
                         <div class="control-label" ng-show="(!userremove_form.username.$dirty && userremove.error.username) || (userremove_form.username.$dirty && userremove_form.username.$invalid)">
-                            <small ng-show="userremove_form.username.$error.required">A username is required</small>
-                            <small ng-show="userremove_form.error.username">The username does not match</small>
+                            <small ng-show="userremove_form.username.$dirty && userremove_form.username.$error.required">A username is required</small>
+                            <small ng-show="!userremove_form.username.$dirty && userremove.error.username">Username or Email does not match</small>
                         </div>
-                        <input type="text" class="form-control" ng-model="userremove.username" id="inputUserRemoveUsername" name="username" placeholder="Username" required autofocus>
+                        <input type="text" class="form-control" ng-model="userremove.username" id="inputUserRemoveUsername" name="username" placeholder="Username or Email" required autofocus>
                     </div>
                     <div class="form-group" ng-class="{ 'has-error': (userremove_form.password.$dirty && userremove_form.password.$invalid) || (!userremove_form.password.$dirty && userremove.error.password)}">
                         <label class="control-label">Give your password to verify that you are performing that action</label>
diff --git a/webadmin/src/views/users.js b/webadmin/src/views/users.js
index 9c377bd0a..fe789bc28 100644
--- a/webadmin/src/views/users.js
+++ b/webadmin/src/views/users.js
@@ -326,9 +326,10 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         $scope.userremove.error.username = null;
         $scope.userremove.error.password = null;
 
-        if ($scope.userremove.username !== $scope.userremove.userInfo.username) {
-            $scope.userremove.error.username = 'Username does not match';
+        if ($scope.userremove.username !== $scope.userremove.userInfo.username && $scope.userremove.username !== $scope.userremove.userInfo.email) {
+            $scope.userremove.error.username = true;
             $scope.userremove.username = '';
+            $scope.userremove_form.username.$setPristine();
             $('#inputUserRemoveUsername').focus();
             return;
         }