diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
index b85cebf60db..20b8cd6da1f 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
@@ -647,7 +647,7 @@ public interface CommonApplicationConstants extends Constants {
 
     String removePermission();
 
-    String removeDirectSystemPermissions();
+    String removeDirectSystemPermissionsButtonLabel();
 
     String objectPermission();
 
diff --git a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants.properties b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants.properties
index 50bbad8a5f4..e890eb57c08 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants.properties
+++ b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants.properties
@@ -635,8 +635,8 @@ refreshRate=Refresh Rate
 registerDisksLabel=Register Disks
 remoteDesktop=Remote Desktop
 removeConfirmationPopupMessage=Are you sure you want to remove the following items?
+removeDirectSystemPermissionsButtonLabel=Remove Direct System Permissions
 removeDisk=Remove
-removeDirectSystemPermissions=Remove Direct System Permissions
 removeInterface=Remove
 removePermission=Remove
 removeProfile=Remove
diff --git a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants_ru.properties b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants_ru.properties
index 8ade4b0c372..72894680b34 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants_ru.properties
+++ b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants_ru.properties
@@ -20,6 +20,7 @@ addInstanceImages=\u0421\u043E\u0437\u0434\u0430\u0442\u044C
 addItemButtonLabel=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C
 addPermission=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C
 addSanStorage=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C
+addSystemPermission=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0445 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0439
 addVmHostDevice=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u043E
 addressSanStorage=\u0410\u0434\u0440\u0435\u0441
 admin=\u0410\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0430\u0442\u043E\u0440
@@ -548,8 +549,8 @@ refreshRate=\u041E\u0441\u0432\u0435\u0436\u0438\u0442\u044C \u043E\u0446\u0435\
 registerDisksLabel=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0435 \u0434\u0438\u0441\u043A\u0438
 remoteDesktop=\u0423\u0434\u0430\u043B\u0451\u043D\u043D\u044B\u0439 \u0440\u0430\u0431\u043E\u0447\u0438\u0439 \u0441\u0442\u043E\u043B
 removeConfirmationPopupMessage=\u0412\u044B \u0442\u043E\u0447\u043D\u043E \u0445\u043E\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0435 \u044D\u043B\u0435\u043C\u0435\u043D\u0442\u044B?
+removeDirectSystemPermissionsButtonLabel=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0432\u044b\u0434\u0430\u043d\u043d\u044b\u0445 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0445 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0439
 removeDisk=\u0423\u0434\u0430\u043B\u0438\u0442\u044C
-removeDirectSystemPermissions=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0432\u044b\u0434\u0430\u043d\u043d\u044b\u0445 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0445 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0439
 removeInterface=\u0423\u0434\u0430\u043B\u0438\u0442\u044C
 removePermission=\u0423\u0434\u0430\u043B\u0438\u0442\u044C
 removeProfile=\u0423\u0434\u0430\u043B\u0438\u0442\u044C
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserPermissionListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserPermissionListModel.java
index 95994ff8719..eb0cc462c77 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserPermissionListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserPermissionListModel.java
@@ -15,6 +15,7 @@
 import org.ovirt.engine.core.common.queries.IdQueryParameters;
 import org.ovirt.engine.core.common.queries.QueryReturnValue;
 import org.ovirt.engine.core.common.queries.QueryType;
+import org.ovirt.engine.core.common.utils.ObjectUtils;
 import org.ovirt.engine.ui.frontend.AsyncCallback;
 import org.ovirt.engine.ui.frontend.Frontend;
 import org.ovirt.engine.ui.uicommonweb.UICommand;
@@ -96,17 +97,19 @@ public UICommand getRemoveDirectRolesFromUserCommand() {
         return removeDirectRolesFromUserCommand;
     }
 
-    public void setRemoveDirectRolesFromUserCommand(UICommand removeDirectRolesFromUserCommand) {
+    private void setRemoveDirectRolesFromUserCommand(UICommand removeDirectRolesFromUserCommand) {
         this.removeDirectRolesFromUserCommand = removeDirectRolesFromUserCommand;
     }
 
-    public void removeAllDirect() {
+    private void removeAllDirect() {
         List<Permission> elementsToRemove = getDirectPermissions();
 
-        // Correctly set permissions to delete into the selected items.
-        if (!elementsToRemove.isEmpty()) {
-            setSelectedItem(elementsToRemove.get(0));
+        if (elementsToRemove.isEmpty()) {
+            return;
         }
+
+        // Correctly set permissions to delete into the selected items.
+        setSelectedItem(elementsToRemove.get(0));
         setSelectedItems(elementsToRemove);
 
         remove();
@@ -114,9 +117,11 @@ public void removeAllDirect() {
 
     private List<Permission> getDirectPermissions() {
         List<Permission> directPermissions = new ArrayList<>();
-        if (getItems() == null || getItems().isEmpty()) {
+
+        if (ObjectUtils.isEmpty(getItems())) {
             return directPermissions;
         }
+
         for (Permission item : getItems()) {
             if (item.getAdElementId() != null &&
                     getEntity() != null &&
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/user/UserPermissionActionPanelPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/user/UserPermissionActionPanelPresenterWidget.java
index b4ea302f63e..3df888808d0 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/user/UserPermissionActionPanelPresenterWidget.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/user/UserPermissionActionPanelPresenterWidget.java
@@ -34,7 +34,7 @@ protected UICommand resolveCommand() {
                 return getDetailModel().getAddRoleToUserCommand();
             }
         });
-        addActionButton(new UiCommandButtonDefinition<DbUser, Permission>(getSharedEventBus(), constants.removeDirectSystemPermissions()) {
+        addActionButton(new UiCommandButtonDefinition<DbUser, Permission>(getSharedEventBus(), constants.removeDirectSystemPermissionsButtonLabel()) {
             @Override
             protected UICommand resolveCommand() {
                 return getDetailModel().getRemoveDirectRolesFromUserCommand();