diff --git a/gui/app/templates/components/customize/user-admin.hbs b/gui/app/templates/components/customize/user-admin.hbs
index 0fe365be..7a4050c0 100644
--- a/gui/app/templates/components/customize/user-admin.hbs
+++ b/gui/app/templates/components/customize/user-admin.hbs
@@ -4,21 +4,21 @@
 		<div id="add-user-modal" class="modal" tabindex="-1" role="dialog">
 			<div class="modal-dialog modal-lg" role="document">
 				<div class="modal-content">
-					<div class="modal-header">Add Users</div>
+					<div class="modal-header">{{localize 'user_admin_add'}}</div>
 					<div class="modal-body">
 						<form onsubmit={{action "onAddUser"}}>
 							<div class="form-row">
 								<div class="col">
-									<label for="newUserFirstname">Firstname</label>
-									{{input id="newUserFirstname" type="text" class="form-control" placeholder="Firstname" value=newUser.firstname}}
+									<label for="newUserFirstname">{{localize 'firstname'}}</label>
+									{{input id="newUserFirstname" type="text" class="form-control" placeholder="" value=newUser.firstname}}
 								</div>
 								<div class="col">
-									<label for="newUserLastname">Lastname</label>
-									{{input id="newUserLastname" type="text" class="form-control" placeholder="Lastname" value=newUser.lastname}}
+									<label for="newUserLastname">{{localize 'lastname'}}</label>
+									{{input id="newUserLastname" type="text" class="form-control" placeholder="" value=newUser.lastname}}
 								</div>
 								<div class="col">
-									<label for="newUserEmail">Email</label>
-									{{input id="newUserEmail" type="email" class="form-control" placeholder="Email" value=newUser.email}}
+									<label for="newUserEmail">{{localize 'email'}}</label>
+									{{input id="newUserEmail" type="email" class="form-control" placeholder="" value=newUser.email}}
 								</div>
 							</div>
 							<Ui::UiSpacer @size="200" />
@@ -27,9 +27,9 @@
 						</form>
 						<form onsubmit={{action "onAddUser"}} role="form">
 							<div class="form-group">
-								<label for="edit-group-desc">Bulk Upload</label>
-								{{textarea id="bulkUsers" value=bulkUsers class="form-control" rows="5" placeholder="firstname, lastname, email"}}
-								<small class="form-text text-muted">Comma-delimited list: firstname, lastname, email</small>
+								<label for="edit-group-desc">{{localize 'user_admin_bulk'}}</label>
+								{{textarea id="bulkUsers" value=bulkUsers class="form-control" rows="5" placeholder=""}}
+								<small class="form-text text-muted">{{localize 'user_admin_bulk_format'}}</small>
 							</div>
 							{{ui/ui-button color=constants.Color.Green icon=constants.Icon.People light=true label=(localize 'add') onClick=(action "onAddUsers")}}
 						</form>
diff --git a/gui/app/templates/components/customize/user-groups.hbs b/gui/app/templates/components/customize/user-groups.hbs
index af7bc696..295fda50 100644
--- a/gui/app/templates/components/customize/user-groups.hbs
+++ b/gui/app/templates/components/customize/user-groups.hbs
@@ -3,16 +3,16 @@
 	<div id="add-group-modal" class="modal" tabindex="-1" role="dialog">
 		<div class="modal-dialog" role="document">
 			<div class="modal-content">
-				<div class="modal-header">Add Group</div>
+				<div class="modal-header">{{localize 'group_add'}}</div>
 				<div class="modal-body">
 					<form onsubmit= {{action "onAddGroup"}}>
 						<div class="form-group">
-							<label for="new-group-name">Name</label>
-							{{focus-input id="new-group-name" type="text" class="form-control mousetrap" placeholder="Enter group name" value=newGroup.name}}
-							<small class="form-text text-muted">e.g. Managers, Developers, Acme Team</small>
+							<label for="new-group-name">{{localize 'name'}}</label>
+							{{focus-input id="new-group-name" type="text" class="form-control mousetrap" placeholder="" value=newGroup.name}}
+							<small class="form-text text-muted">{{localize 'group_name_explain'}}</small>
 						</div>
 						<div class="form-group">
-							<label for="new-group-desc">Description (optional)</label>
+							<label for="new-group-desc">{{localize 'description'}}</label>
 							{{textarea id="new-group-desc" value=newGroup.purpose class="form-control" rows="3"}}
 						</div>
 					</form>
@@ -37,12 +37,12 @@
 				<div class="desc">{{group.purpose}}</div>
 				<Ui::UiSpacer @size="200" />
 				{{#ui/ui-toolbar dark=false light=true raised=true large=false bordered=true}}
-					{{ui/ui-toolbar-icon icon=constants.Icon.AddUser color=constants.Color.Gray tooltip="Add members" onClick=(action "onShowAddMemberModal" group.id)}}
+					{{ui/ui-toolbar-icon icon=constants.Icon.AddUser color=constants.Color.Gray tooltip=(localize 'group_member_add') onClick=(action "onShowAddMemberModal" group.id)}}
 					{{#if (gt group.members 0)}}
-						{{ui/ui-toolbar-icon icon=constants.Icon.RemoveUser color=constants.Color.Gray tooltip="Remove members" onClick=(action "onShowRemoveMemberModal" group.id)}}
+						{{ui/ui-toolbar-icon icon=constants.Icon.RemoveUser color=constants.Color.Gray tooltip=(localize 'group_member_remove') onClick=(action "onShowRemoveMemberModal" group.id)}}
 					{{/if}}
-					{{ui/ui-toolbar-icon icon=constants.Icon.Edit color=constants.Color.Gray tooltip="Edit group" onClick=(action "onShowEditModal" group.id)}}
-					{{ui/ui-toolbar-icon icon=constants.Icon.Delete color=constants.Color.Red tooltip="Delete group" onClick=(action "onShowDeleteModal" group.id)}}
+					{{ui/ui-toolbar-icon icon=constants.Icon.Edit color=constants.Color.Gray tooltip=(localize 'edit') onClick=(action "onShowEditModal" group.id)}}
+					{{ui/ui-toolbar-icon icon=constants.Icon.Delete color=constants.Color.Red tooltip=(localize 'delete') onClick=(action "onShowDeleteModal" group.id)}}
 				{{/ui/ui-toolbar}}
 			</div>
 		{{/each}}
@@ -51,14 +51,14 @@
 	<div id="delete-group-modal" class="modal" tabindex="-1" role="dialog">
 		<div class="modal-dialog" role="document">
 			<div class="modal-content">
-				<div class="modal-header">Delete Group</div>
+				<div class="modal-header">{{localize 'group_delete'}}</div>
 				<div class="modal-body">
 					<form onsubmit= {{action "onDeleteGroup"}} role="form">
-						<p>Are you sure you want to delete this group?</p>
+						<p>{{localize 'group_delete_confirm'}}</p>
 						<div class="form-group">
-							<label for="delete-group-name">Please type group name to confirm</label>
-							{{input id="delete-group-name" type="text" class="form-control mousetrap" placeholder="Group name" value=deleteGroup.name}}
-							<small class="form-text text-muted">This will remove group membership information and associated permissions!</small>
+							<label for="delete-group-name">{{localize 'group_delete_name'}}</label>
+							{{input id="delete-group-name" type="text" class="form-control mousetrap" placeholder="" value=deleteGroup.name}}
+							<small class="form-text text-muted">{{localize 'group_delete_name_explain'}}</small>
 						</div>
 					</form>
 				</div>
@@ -74,16 +74,16 @@
 	<div id="edit-group-modal" class="modal" tabindex="-1" role="dialog">
 		<div class="modal-dialog" role="document">
 			<div class="modal-content">
-				<div class="modal-header">Edit Group</div>
+				<div class="modal-header">{{localize 'group_edit'}}</div>
 				<div class="modal-body">
 					<form onsubmit= {{action "onEditGroup"}} role="form">
 						<div class="form-group">
-							<label for="edit-group-name">Name</label>
-							{{input id="edit-group-name" type="text" class="form-control mousetrap" placeholder="Enter group name" value=editGroup.name}}
-							<small class="form-text text-muted">e.g. Managers, Developers, Acme Team</small>
+							<label for="edit-group-name">{{localize 'name'}}</label>
+							{{input id="edit-group-name" type="text" class="form-control mousetrap" placeholder="" value=editGroup.name}}
+							<small class="form-text text-muted">{{localize 'group_name_explain'}}</small>
 						</div>
 						<div class="form-group">
-							<label for="edit-group-desc">Description (optional)</label>
+							<label for="edit-group-desc">{{localize 'description'}}</label>
 							{{textarea id="edit-group-desc" value=editGroup.purpose class="form-control" rows="3"}}
 						</div>
 					</form>
@@ -100,14 +100,14 @@
 	<div id="group-remove-member-modal" class="modal" tabindex="-1" role="dialog">
 		<div class="modal-dialog modal-lg" role="document">
 			<div class="modal-content">
-				<div class="modal-header">Remove Member &mdash; {{membersGroup.name}} ({{members.length}})</div>
+				<div class="modal-header">{{localize 'group_member_remove'}} &mdash; {{membersGroup.name}} ({{members.length}})</div>
 				<div class="modal-body">
 					<div class="view-customize">
 						<div class="group-users-members">
 							{{#each members as |member|}}
 								<div class="item">
 									{{#ui/ui-toolbar dark=false light=true raised=true large=false bordered=true}}
-										{{ui/ui-toolbar-icon icon=constants.Icon.RemoveUser color=constants.Color.Red tooltip="Remove member" onClick=(action "onLeaveGroup" member.userId)}}
+										{{ui/ui-toolbar-icon icon=constants.Icon.RemoveUser color=constants.Color.Red tooltip=(localize 'remove') onClick=(action "onLeaveGroup" member.userId)}}
 										{{ui/ui-toolbar-label color=constants.Color.Gray label=member.fullname onClick=(action "onLeaveGroup" member.userId)}}
 									{{/ui/ui-toolbar}}
 								</div>
@@ -125,12 +125,12 @@
 	<div id="group-add-member-modal" class="modal" tabindex="-1" role="dialog">
 		<div class="modal-dialog modal-lg" role="document">
 			<div class="modal-content">
-				<div class="modal-header">Add Member &mdash; {{membersGroup.name}} ({{members.length}})</div>
+				<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">Find users</label>
-						{{input id="group-members-search" type="text" class="form-control mousetrap" placeholder="Search members and users..." value=searchText key-up=(action "onSearch")}}
-						<small class="form-text text-muted">firstname, lastname, email</small>
+						<label for="group-members-search">{{localize 'group_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>
 					</div>
 					<div class="view-customize">
 						<div class="text-center">
@@ -152,9 +152,9 @@
 								<div class="item">
 									{{#ui/ui-toolbar dark=false light=true raised=true large=false bordered=true}}
 										{{#if user.isMember}}
-											{{ui/ui-toolbar-icon icon=constants.Icon.RemoveUser color=constants.Color.Red tooltip="Remove member" onClick=(action "onLeaveGroup" user.id)}}
+											{{ui/ui-toolbar-icon icon=constants.Icon.RemoveUser color=constants.Color.Red tooltip=(localize 'remove') onClick=(action "onLeaveGroup" user.id)}}
 										{{else}}
-											{{ui/ui-toolbar-icon icon=constants.Icon.AddUser color=constants.Color.Green tooltip="Add member" onClick=(action "onJoinGroup" user.id)}}
+											{{ui/ui-toolbar-icon icon=constants.Icon.AddUser color=constants.Color.Green tooltip=(localize 'add') onClick=(action "onJoinGroup" user.id)}}
 											{{ui/ui-toolbar-label color=constants.Color.Gray label=(concat user.firstname " " user.lastname) onClick=(action "onJoinGroup" user.id)}}
 										{{/if}}
 									{{/ui/ui-toolbar}}
diff --git a/gui/public/i18n/en-US.json b/gui/public/i18n/en-US.json
index ee0beb79..7eebf207 100644
--- a/gui/public/i18n/en-US.json
+++ b/gui/public/i18n/en-US.json
@@ -9,6 +9,7 @@
     "copy": "Copy",
     "delete": "Delete",
     "deleted": "Deleted",
+    "remove": "Remove",
     "duplicate": "Duplicate",
     "edit": "Edit",
     "import": "Import",
@@ -27,7 +28,6 @@
     "print": "Print",
     "reject": "Reject",
     "rejected": "Rejected",
-    "remove": "Remove",
     "reply": "Reply",
     "reset": "Reset",
     "restore": "Restore",
@@ -55,6 +55,9 @@
     "icon": "Icon",
     "color": "Color",
     "running": "Running...",
+    "firstname": "Firstname",
+    "lastname": "Lastname",
+    "email": "Email",
 
     "filter": "Filter",
     "all": "All",
@@ -168,6 +171,22 @@
     "label_update": "Update Label",
     "label_delete": "Delete Label",
     "label_delete_confirm": "Are you sure you want to delete the label {1}?",
+    "user_admin_add": "Add Users",
+    "user_admin_bulk": "Bulk Upload",
+    "user_admin_bulk_format": "Comma-delimited list: firstname, lastname, email",
+    "group_add": "Add Group",
+    "group_name_explain": "Enter group name, e.g. Managers, Developers, Acme Team",
+    "group_member_add": "Add member",
+    "group_member_remove": "Remove member",
+    "group_delete": "Delete Group",
+    "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_edit": "Edit Group",
+    "group_find_user": "Find users",
+    "group_find_user_syntax": "firstname, lastname, email",
 
-    "x": "x"
+
+
+    "---": "---"
 }