diff --git a/webadmin/src/views/users.html b/webadmin/src/views/users.html
index 9ff986202..d6001fb84 100644
--- a/webadmin/src/views/users.html
+++ b/webadmin/src/views/users.html
@@ -268,10 +268,13 @@
                                 <td>
                                     <i class="fa fa-briefcase arrow" ng-show="user.admin" uib-tooltip="This user can manage apps, groups and other users"></i>
                                 </td>
-                                <td class="hand elide-table-cell" ng-click="showUserEdit(user)">
+                                <td class="hand elide-table-cell" ng-click="showUserEdit(user)" ng-show="user.username">
                                     {{ user.username }}
                                     <span class="text-muted">{{ user.email }}</span>
                                 </td>
+                                <td class="hand elide-table-cell" ng-click="showUserEdit(user)" ng-hide="user.username">
+                                    <span class="text-muted" uib-tooltip="User is not activated yet">{{ user.alternateEmail || user.email }}</span>
+                                </td>
                                 <td class="text-left hand elide-table-cell hidden-xs hidden-sm" ng-click="showUserEdit(user)">
                                     <span class="group-badge" ng-repeat="groupId in user.groupIds | ignoreAdminGroup">{{ groupId }}</span>
                                 </td>
diff --git a/webadmin/src/views/users.js b/webadmin/src/views/users.js
index 50ca41d5a..18bb391e6 100644
--- a/webadmin/src/views/users.js
+++ b/webadmin/src/views/users.js
@@ -333,7 +333,7 @@ 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.username !== $scope.userremove.userInfo.email) {
+        if ($scope.userremove.username !== $scope.userremove.userInfo.username && $scope.userremove.username !== $scope.userremove.userInfo.email && $scope.userremove.username !== $scope.userremove.userInfo.alternateEmail) {
             $scope.userremove.error.username = true;
             $scope.userremove.username = '';
             $scope.userremove_form.username.$setPristine();