diff --git a/app/core/src/main/resources/messages_en_GB.properties b/app/core/src/main/resources/messages_en_GB.properties
index f78e80b65..b77391639 100644
--- a/app/core/src/main/resources/messages_en_GB.properties
+++ b/app/core/src/main/resources/messages_en_GB.properties
@@ -414,6 +414,9 @@ account.adminNotif=You have admin privileges. Access system settings and user ma
 
 adminUserSettings.title=User Control Settings
 adminUserSettings.header=Admin User Control Settings
+adminUserSettings.systemAdmin=System Administrator
+adminUserSettings.orgAdmin=Organisation Administrator
+adminUserSettings.teamLead=Team Leader
 adminUserSettings.admin=Admin
 adminUserSettings.user=User
 adminUserSettings.addUser=Add New User
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/model/User.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/User.java
index 9b0b06dc5..2d510cce3 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/security/model/User.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/User.java
@@ -55,7 +55,11 @@ public class User implements Serializable {
     @Column(name = "authenticationtype")
     private String authenticationType;
 
-    @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL, mappedBy = "user")
+    @OneToMany(
+            fetch = FetchType.EAGER,
+            cascade = CascadeType.ALL,
+            mappedBy = "user",
+            orphanRemoval = true)
     private Set<Authority> authorities = new HashSet<>();
 
     @ManyToOne(fetch = FetchType.EAGER)