diff --git a/gui/app/components/customize/user-list.js b/gui/app/components/customize/user-list.js
index 4ef034b2..29d5f619 100644
--- a/gui/app/components/customize/user-list.js
+++ b/gui/app/components/customize/user-list.js
@@ -222,6 +222,8 @@ export default Component.extend(AuthProvider, ModalMixin, Notifier, {
 			})
 			this.set('groups', groups);
 
+			if (_.isNull(groups)) return;
+
 			this.modalOpen("#group-member-modal", {"show": true});
 		},
 
diff --git a/gui/app/templates/components/customize/user-groups.hbs b/gui/app/templates/components/customize/user-groups.hbs
index 295fda50..8e2706a3 100644
--- a/gui/app/templates/components/customize/user-groups.hbs
+++ b/gui/app/templates/components/customize/user-groups.hbs
@@ -128,9 +128,9 @@
 				<div class="modal-header">{{localize 'group_member_add'}} &mdash; {{membersGroup.name}} ({{members.length}})</div>
 				<div class="modal-body">
 					<div class="form-group">
-						<label for="group-members-search">{{localize 'group_find_user'}}</label>
+						<label for="group-members-search">{{localize 'find_user'}}</label>
 						{{input id="group-members-search" type="text" class="form-control mousetrap" placeholder="" value=searchText key-up=(action "onSearch")}}
-						<small class="form-text text-muted">{{localize 'group_find_user_syntax'}}</small>
+						<small class="form-text text-muted">{{localize 'find_user_syntax'}}</small>
 					</div>
 					<div class="view-customize">
 						<div class="text-center">
diff --git a/gui/app/templates/components/customize/user-list.hbs b/gui/app/templates/components/customize/user-list.hbs
index 4875127d..38db8acc 100644
--- a/gui/app/templates/components/customize/user-list.hbs
+++ b/gui/app/templates/components/customize/user-list.hbs
@@ -2,25 +2,25 @@
 	{{#if isAuthProviderKeycloak}}
 		<Ui::UiSpacer @size="300" />
 		{{#if syncInProgress}}
-			{{ui/ui-button color=constants.Color.Gray light=true icon=constants.Icon.Locked label="Keycloak user sync running..."}}
+			{{ui/ui-button color=constants.Color.Gray light=true icon=constants.Icon.Locked label=(localize 'auth_keycloak_running')}}
 		{{else}}
-			{{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.Locked label="Sync with Keycloak" onClick=(action "onSyncKeycloak")}}
+			{{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.Locked label=(localize 'auth_keycloak_sync') onClick=(action "onSyncKeycloak")}}
 		{{/if}}
 	{{/if}}
 
 	{{#if (or isAuthProviderLDAP isDualAuth)}}
 		<Ui::UiSpacer @size="300" />
 		{{#if syncInProgress}}
-			{{ui/ui-button color=constants.Color.Gray light=true icon=constants.Icon.Locked label="LDAP user sync running..."}}
+			{{ui/ui-button color=constants.Color.Gray light=true icon=constants.Icon.Locked label=(localize 'auth_ldap_running')}}
 		{{else}}
-			{{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.Locked label="Sync with LDAP" onClick=(action "onSyncLDAP")}}
+			{{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.Locked label=(localize 'auth_ldap_sync') onClick=(action "onSyncLDAP")}}
 		{{/if}}
 	{{/if}}
 
 	<Ui::UiSpacer @size="300" />
 	<div class="explain-user-perms">
 		<div class="title" {{action "togglePerms"}}>
-			Permissions Explained
+			{{localize 'permissions'}}
 			{{#if showPermExplain}}
 				<i class="dicon {{constants.Icon.ArrowSmallUp}}" />
 			{{else}}
@@ -28,27 +28,27 @@
 			{{/if}}
 		</div>
 		<div class="perms">
-			<div class="perm-name">Spaces</div>
-			<div class="perm-desc">Can add spaces, both personal and shared with others</div>
-			<div class="perm-name">Visible</div>
-			<div class="perm-desc">Can see names of users and groups, can disable for external users like customers/partners</div>
-			<div class="perm-name">Admin</div>
-			<div class="perm-desc">Can manage all aspects of Documize, like this screen</div>
-			<div class="perm-name">Analytics</div>
-			<div class="perm-desc">Can view analytical reports<</div>
-			<div class="perm-name">Active</div>
-			<div class="perm-desc">Can login and use Documize</div>
+			<div class="perm-name">{{localize 'permission_spaces'}}</div>
+			<div class="perm-desc">{{localize 'permission_spaces_explain'}}</div>
+			<div class="perm-name">{{localize 'permission_visible'}}</div>
+			<div class="perm-desc">{{localize 'permission_visible_explain'}}</div>
+			<div class="perm-name">{{localize 'permission_admin'}}</div>
+			<div class="perm-desc">{{localize 'permission_admin_explain'}}</div>
+			<div class="perm-name">{{localize 'permission_analytics'}}</div>
+			<div class="perm-desc">{{localize 'permission_analytics_explain'}}<</div>
+			<div class="perm-name">{{localize 'permission_active'}}</div>
+			<div class="perm-desc">{{localize 'permission_active_explain'}}</div>
 		</div>
 	</div>
 	<Ui::UiSpacer @size="300" />
 
 	<div class="form-group">
-		{{focus-input type="text" class="form-control" placeholder="filter users" value=filter key-up=(action "onFilterChange")}}
-		<small class="form-text text-muted">search firstname, lastname, email</small>
+		{{focus-input type="text" class="form-control" placeholder=(localize 'find_user') value=filter key-up=(action "onFilterChange")}}
+		<small class="form-text text-muted">{{localize 'find_user_syntax'}}</small>
 	</div>
 
 	<div class="text-center">
-		{{#ui/ui-toolbar dark=false light=false raised=false large=true bordered=false tooltip="Maximum users to display"}}
+		{{#ui/ui-toolbar dark=false light=false raised=false large=true bordered=false tooltip=(localize 'user_max_display')}}
 			{{ui/ui-toolbar-label color=constants.Color.Gray label="5" selected=(eq userLimit 5) onClick=(action "onLimit" 5)}}
 			{{ui/ui-toolbar-label color=constants.Color.Gray label="10" selected=(eq userLimit 10) onClick=(action "onLimit" 10)}}
 			{{ui/ui-toolbar-label color=constants.Color.Gray label="25" selected=(eq userLimit 25) onClick=(action "onLimit" 25)}}
@@ -72,15 +72,15 @@
 							color=constants.Color.Red
 							light=false
 							icon=constants.Icon.Delete
-							label="Delete selected users"
+							label=(localize 'delete')
 							onClick=(action "onShowDeleteBulk")}}
 					{{/if}}
 				</th>
-				<th class="no-width">Spaces</th>
-				<th class="no-width">Visible</th>
-				<th class="no-width">Analytics</th>
-				<th class="no-width">Admin</th>
-				<th class="no-width">Active</th>
+				<th class="no-width">{{localize 'permission_spaces'}}</th>
+				<th class="no-width">{{localize 'permission_visible'}}</th>
+				<th class="no-width">{{localize 'permission_analytics'}}</th>
+				<th class="no-width">{{localize 'permission_admin'}}</th>
+				<th class="no-width">{{localize 'permission_active'}}</th>
 				<th class="no-width"></th>
 			</tr>
 		</thead>
@@ -107,7 +107,7 @@
 									{{group.name}}{{#if (not-eq group user.groups.lastObject)}}, {{/if}}
 								</span>
 							{{else}}
-								<span class="group">&lt;no groups&gt;</span>
+								<span class="group">&lt;{{localize 'group_none'}}&gt;</span>
 							{{/each}}
 						</div>
 					</td>
@@ -152,10 +152,10 @@
 					</td>
 					<td class="no-width text-center align-middle">
 						{{#ui/ui-toolbar dark=false light=true raised=true large=false bordered=true}}
-							{{ui/ui-toolbar-icon icon=constants.Icon.Edit color=constants.Color.Gray tooltip="Edit user" onClick=(action "onShowEdit" user.id)}}
-							{{ui/ui-toolbar-icon icon=constants.Icon.AddUser color=constants.Color.Gray tooltip="Assign user groups" onClick=(action "onShowGroupsModal" user.id)}}
+							{{ui/ui-toolbar-icon icon=constants.Icon.Edit color=constants.Color.Gray tooltip=(localize 'edit') onClick=(action "onShowEdit" user.id)}}
+							{{ui/ui-toolbar-icon icon=constants.Icon.AddUser color=constants.Color.Gray tooltip=(localize 'user_assign_group') onClick=(action "onShowGroupsModal" user.id)}}
 							{{#unless user.me}}
-								{{ui/ui-toolbar-icon icon=constants.Icon.Delete color=constants.Color.Red tooltip="Delete user" onClick=(action "onShowDelete" user.id)}}
+								{{ui/ui-toolbar-icon icon=constants.Icon.Delete color=constants.Color.Red tooltip=(localize 'delete') onClick=(action "onShowDelete" user.id)}}
 							{{/unless}}
 						{{/ui/ui-toolbar}}
 					</td>
@@ -166,7 +166,7 @@
 </div>
 
 {{#ui/ui-dialog title="Delete User" confirmCaption="Delete" buttonColor=constants.Color.Red show=showDeleteDialog onAction=(action "onDelete")}}
-	<p>Are you sure you want to delete {{deleteUser.fullname}}?</p>
+	<p>{{localize 'user_delete_confirm' deleteUser.fullname}}</p>
 {{/ui/ui-dialog}}
 
 <div id="edit-user-modal" class="modal" tabindex="-1" role="dialog">
@@ -176,27 +176,27 @@
 			<div class="modal-body">
 				<form role="form">
 					<div class="form-group">
-						<label for="edit-firstname">Firstname</label>
+						<label for="edit-firstname">{{localize 'firstname'}}</label>
 						{{input id="edit-firstname" class="form-control" type="text" value=editUser.firstname}}
 					</div>
 					<div class="form-group">
-						<label for="edit-lastname">Lastname</label>
+						<label for="edit-lastname">{{localize 'lastname'}}</label>
 						{{input id="edit-lastname" type="text" class="form-control" value=editUser.lastname}}
 					</div>
 					<div class="form-group">
-						<label for="edit-email">Email</label>
+						<label for="edit-email">{{localize 'email'}}</label>
 						{{input id="edit-email" type="text" class="form-control" value=editUser.email}}
 					</div>
 					{{#if (or isAuthProviderDocumize isDualAuth)}}
 						<div class="form-group">
-							<label for="edit-password">Password</label>
+							<label for="edit-password">{{localize 'password'}}</label>
 							{{input id="edit-password" type="password" class="form-control" value=password.password}}
-							<small class="form-text text-muted">Optional new password</small>
+							<small class="form-text text-muted">Optional</small>
 						</div>
 						<div class="form-group">
 							<label for="edit-confirmPassword">Confirm Password</label>
 							{{input id="edit-confirmPassword" type="password" class="form-control" value=password.confirmation}}
-							<small class="form-text text-muted">Confirm new password</small>
+							<small class="form-text text-muted"></small>
 						</div>
 					{{/if}}
 				</form>
@@ -213,9 +213,9 @@
 <div id="admin-user-delete-modal" class="modal" tabindex="-1" role="dialog">
 	<div class="modal-dialog" role="document">
 		<div class="modal-content">
-			<div class="modal-header">Delete Users</div>
+			<div class="modal-header">{{localize 'user_delete'}}</div>
 			<div class="modal-body">
-				<p>Are you sure you want to delete selected users?</p>
+				<p>{{localize 'user_selected_delete_confirm'}}</p>
 			</div>
 			<div class="modal-footer">
 				{{ui/ui-button color=constants.Color.Gray light=true label=(localize 'close') dismiss=true}}
diff --git a/gui/public/i18n/en-US.json b/gui/public/i18n/en-US.json
index 7eebf207..758cb5e7 100644
--- a/gui/public/i18n/en-US.json
+++ b/gui/public/i18n/en-US.json
@@ -58,6 +58,8 @@
     "firstname": "Firstname",
     "lastname": "Lastname",
     "email": "Email",
+    "password": "Password",
+    "password_confirm": "Confirm Password",
 
     "filter": "Filter",
     "all": "All",
@@ -93,6 +95,22 @@
     "auth_connect_keycloak": "Connect to authentication server",
     "auth_connect_ldap": "Connect to LDAP/Active Directory",
     "auth_connect_cas": "Connect to Central Authentication Server",
+    "auth_keycloak_running": "Keycloak user sync running...",
+    "auth_keycloak_sync": "Sync with Keycloak",
+    "auth_ldap_running": "LDAP user sync running...",
+    "auth_ldap_sync": "Sync with LDAP",
+    "permissions": "Permissions",
+    "permission_spaces": "Spaces",
+    "permission_spaces_explain": "Can add spaces, both personal and shared with others",
+    "permission_visible": "Visible",
+    "permission_visible_explain": "Can see names of users and groups, can disable for external users like customers/partners",
+    "permission_admin": "Admin",
+    "permission_admin_explain": "Can manage all aspects of Documize Community, like this screen",
+    "permission_analytics": "Analytics",
+    "permission_analytics_explain": "Can view analytical reports",
+    "permission_active": "Active",
+    "permission_active_explain": "Can login and use Documize Community",
+
 
     "backup_explain1": "Documize Community is a multi-tenanted application enabling both 'tech.mycompany.com' and 'sales.mycompany.com' to run using the same executable/database. As a Documize Community Global Administrator, you will be performing a complete system-wide backup across all tenants. The Documize Community Tenant Administrator can login to perform a tenant-level backup (e.g. marketing.mycompany.com).",
     "backup_explain2": "Documize Community is a multi-tenanted application enabling both 'tech.mycompany.com' and 'sales.mycompany.com' to run using the same executable/database. A Documize Community Global Administrator, you will be performing a complete system-wide backup across all tenants. As a Documize Community Tenant Administrator you can perform a tenant-level backup (e.g. marketing.mycompany.com).",
@@ -182,9 +200,15 @@
     "group_delete_confirm": "Are you sure you want to delete this group?",
     "group_delete_name": "Please type group name to confirm",
     "group_delete_name_explain": "This will remove group membership information and associated permissions",
+    "group_none": "No groups",
     "group_edit": "Edit Group",
-    "group_find_user": "Find users",
-    "group_find_user_syntax": "firstname, lastname, email",
+    "find_user": "Find users",
+    "find_user_syntax": "Search firstname, lastname, email",
+    "user_max_display": "Maximum users to display",
+    "user_assign_group": "Assign user groups",
+    "user_delete_confirm": "Are you sure you want to delete user {1}?",
+    "user_selected_delete_confirm": "Are you sure you want to delete selected users?",
+    "user_delete": "Delete User",