diff --git a/console/src/app/pages/users/user-detail/user-detail/user-detail.component.html b/console/src/app/pages/users/user-detail/user-detail/user-detail.component.html
index b63428a1a..c12ae81a0 100644
--- a/console/src/app/pages/users/user-detail/user-detail/user-detail.component.html
+++ b/console/src/app/pages/users/user-detail/user-detail/user-detail.component.html
@@ -23,7 +23,7 @@
           <button mat-menu-item color="warn" *ngIf="user?.state === UserState.USER_STATE_LOCKED"
             (click)="unlockUser()">{{'USER.PAGES.UNLOCK' |
             translate}}</button>
-          <button mat-menu-item *ngIf="user?.state !== UserState.USER_STATE_INACTIVE"
+          <button mat-menu-item *ngIf="user?.state === UserState.USER_STATE_ACTIVE"
             (click)="changeState(UserState.USER_STATE_INACTIVE)">{{'USER.PAGES.DEACTIVATE' |
             translate}}</button>
           <button mat-menu-item *ngIf="user?.state === UserState.USER_STATE_INACTIVE"
diff --git a/console/src/app/pages/users/user-list/user-table/user-table.component.ts b/console/src/app/pages/users/user-list/user-table/user-table.component.ts
index de5122e74..acba3a865 100644
--- a/console/src/app/pages/users/user-list/user-table/user-table.component.ts
+++ b/console/src/app/pages/users/user-list/user-table/user-table.component.ts
@@ -104,9 +104,11 @@ export class UserTableComponent implements OnInit {
 
   public deactivateSelectedUsers(): void {
     Promise.all(
-      this.selection.selected.map((value) => {
-        return this.userService.deactivateUser(value.id);
-      }),
+      this.selection.selected
+        .filter((u) => u.state === UserState.USER_STATE_ACTIVE)
+        .map((value) => {
+          return this.userService.deactivateUser(value.id);
+        }),
     )
       .then(() => {
         this.toast.showInfo('USER.TOAST.SELECTEDDEACTIVATED', true);
@@ -122,9 +124,11 @@ export class UserTableComponent implements OnInit {
 
   public reactivateSelectedUsers(): void {
     Promise.all(
-      this.selection.selected.map((value) => {
-        return this.userService.reactivateUser(value.id);
-      }),
+      this.selection.selected
+        .filter((u) => u.state === UserState.USER_STATE_INACTIVE)
+        .map((value) => {
+          return this.userService.reactivateUser(value.id);
+        }),
     )
       .then(() => {
         this.toast.showInfo('USER.TOAST.SELECTEDREACTIVATED', true);