diff --git a/public/src/admin/manage/users.js b/public/src/admin/manage/users.js
index cef83479be..ebd23da5fc 100644
--- a/public/src/admin/manage/users.js
+++ b/public/src/admin/manage/users.js
@@ -307,7 +307,7 @@ define('admin/manage/users', ['translator', 'benchpress', 'autocomplete'], funct
 		function handleUserCreate() {
 			$('#createUser').on('click', function () {
 				Benchpress.parse('admin/partials/create_user_modal', {}, function (html) {
-					bootbox.dialog({
+					var modal = bootbox.dialog({
 						message: html,
 						title: '[[admin/manage/users:alerts.create]]',
 						onEscape: true,
@@ -326,6 +326,9 @@ define('admin/manage/users', ['translator', 'benchpress', 'autocomplete'], funct
 							},
 						},
 					});
+					modal.on('shown.bs.modal', function () {
+						modal.find('#create-user-name').focus();
+					});
 				});
 				return false;
 			});