diff --git a/openstack_dashboard/dashboards/identity/users/forms.py b/openstack_dashboard/dashboards/identity/users/forms.py
index d1bb88d493..771f5c626c 100644
--- a/openstack_dashboard/dashboards/identity/users/forms.py
+++ b/openstack_dashboard/dashboards/identity/users/forms.py
@@ -106,6 +106,9 @@ class CreateUserForm(PasswordMixin, BaseUserForm):
                                        add_item_link=ADD_PROJECT_URL)
     role_id = forms.ChoiceField(label=_("Role"),
                                 required=PROJECT_REQUIRED)
+    enabled = forms.BooleanField(label=_("Enabled"),
+                                 required=False,
+                                 initial=True)
 
     def __init__(self, *args, **kwargs):
         roles = kwargs.pop('roles')
@@ -113,7 +116,8 @@ class CreateUserForm(PasswordMixin, BaseUserForm):
         # Reorder form fields from multiple inheritance
         ordering = ["domain_id", "domain_name", "name",
                     "description", "email", "password",
-                    "confirm_password", "project", "role_id"]
+                    "confirm_password", "project", "role_id",
+                    "enabled"]
         # Starting from 1.7 Django uses OrderedDict for fields and keyOrder
         # no longer works for it
         if django.VERSION >= (1, 7):
@@ -149,7 +153,7 @@ class CreateUserForm(PasswordMixin, BaseUserForm):
                                                 description=desc,
                                                 password=data['password'],
                                                 project=data['project'],
-                                                enabled=True,
+                                                enabled=data['enabled'],
                                                 domain=domain.id)
             messages.success(request,
                              _('User "%s" was successfully created.')
diff --git a/openstack_dashboard/dashboards/identity/users/tests.py b/openstack_dashboard/dashboards/identity/users/tests.py
index b017274346..d82997e38e 100644
--- a/openstack_dashboard/dashboards/identity/users/tests.py
+++ b/openstack_dashboard/dashboards/identity/users/tests.py
@@ -120,6 +120,7 @@ class UsersViewTests(test.BaseAdminViewTests):
                     'password': user.password,
                     'project': self.tenant.id,
                     'role_id': self.roles.first().id,
+                    'enabled': True,
                     'confirm_password': user.password}
         res = self.client.post(USER_CREATE_URL, formData)
 
@@ -170,6 +171,7 @@ class UsersViewTests(test.BaseAdminViewTests):
                     'name': user.name,
                     'description': user.description,
                     'email': "",
+                    'enabled': True,
                     'password': user.password,
                     'project': self.tenant.id,
                     'role_id': self.roles.first().id,