diff --git a/src/main/java/com/keybox/manage/db/UserDB.java b/src/main/java/com/keybox/manage/db/UserDB.java
index b118fe81..052c1bf9 100755
--- a/src/main/java/com/keybox/manage/db/UserDB.java
+++ b/src/main/java/com/keybox/manage/db/UserDB.java
@@ -277,6 +277,9 @@ public static void updateUserNoCredentials(User user) {
             stmt.setLong(6, user.getId());
             stmt.execute();
             DBUtils.closeStmt(stmt);
+            if (User.ADMINISTRATOR.equals(user.getUserType())) {
+                PublicKeyDB.deleteUnassignedKeysByUser(con, user.getId());
+            }
 
         } catch (Exception e) {
             log.error(e.toString(), e);
@@ -307,6 +310,9 @@ public static void updateUserCredentials(User user) {
             stmt.setLong(8, user.getId());
             stmt.execute();
             DBUtils.closeStmt(stmt);
+            if(User.ADMINISTRATOR.equals(user.getUserType())) {
+                PublicKeyDB.deleteUnassignedKeysByUser(con, user.getId());
+            }
 
         } catch (Exception e) {
             log.error(e.toString(), e);