diff --git a/ui/src/app/admin/component/user-management.component.html b/ui/src/app/admin/component/user-management.component.html
index 683f15447..e7da37de6 100644
--- a/ui/src/app/admin/component/user-management.component.html
+++ b/ui/src/app/admin/component/user-management.component.html
@@ -17,12 +17,16 @@
             <td>{{ user.firstName }} {{ user.lastName }}</td>
             <td>{{ user.emailAddress }}</td>
             <td>
-                <select [name]="user.username" [ngModel]="user.role" class="form-control" (change)="setUserRole(user, $event.target.value)">
+                <select [name]="user.username"
+                    [ngModel]="user.role"
+                    class="form-control"
+                    (change)="setUserRole(user, $event.target.value)"
+                    [disabled]="currentUser.username === user.username">
                     <option *ngFor="let role of roles$ | async" [value]="role">{{ role }}</option>
                 </select>
             </td>
             <td>
-                <button class="btn btn-link" (click)="deleteUser(user.username)">
+                <button class="btn btn-link" (click)="deleteUser(user.username)" *ngIf="!(currentUser.username === user.username)">
                     <span class="sr-only" translate="label.delete-user">
                         Delete User
                     </span>
diff --git a/ui/src/app/admin/component/user-management.component.ts b/ui/src/app/admin/component/user-management.component.ts
index 40c0cb8d7..3231050ae 100644
--- a/ui/src/app/admin/component/user-management.component.ts
+++ b/ui/src/app/admin/component/user-management.component.ts
@@ -1,4 +1,4 @@
-import { Component, ChangeDetectionStrategy, OnInit } from '@angular/core';
+import { Component, ChangeDetectionStrategy, OnInit, OnDestroy } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 
@@ -18,7 +18,7 @@ import { map } from 'rxjs/operators';
     templateUrl: './user-management.component.html',
     styleUrls: []
 })
-export class UserManagementComponent implements OnInit {
+export class UserManagementComponent implements OnInit, OnDestroy {
 
     users$: Observable<Admin[]>;
     currentUser: Admin;
@@ -32,15 +32,18 @@ export class UserManagementComponent implements OnInit {
         protected modal: NgbModal
     ) {
         this.roles$ = this.store.select(fromCore.getUserRoles);
+        let user$ = this.store.select(fromCore.getUser);
+        this.userSub = user$.subscribe(u => this.currentUser = u);
     }
 
     ngOnInit(): void {
         this.users$ = this.store.select(fromAdmin.getAllConfiguredAdmins);
         this.hasUsers$ = this.users$.pipe(map(userList => userList.length > 0));
         this.users$ = this.store.select(fromAdmin.getAllAdmins);
-        let user$ = this.store.select(fromCore.getUser);
+    }
 
-        this.userSub = user$.subscribe(u => this.currentUser = u);
+    ngOnDestroy(): void {
+        this.userSub.unsubscribe();
     }
 
     setUserRole(user: Admin, change: string): void {