diff --git a/src/Controller/UserSettingsController.php b/src/Controller/UserSettingsController.php
index bced32b..02affce 100644
--- a/src/Controller/UserSettingsController.php
+++ b/src/Controller/UserSettingsController.php
@@ -57,7 +57,7 @@ class UserSettingsController extends AppController
         }
     }
 
-    public function add($user_id = false)
+    public function add($user_id=null)
     {
         $currentUser = $this->ACL->getUser();
         $this->CRUD->add([
@@ -77,6 +77,8 @@ class UserSettingsController extends AppController
         if (empty($currentUser['role']['perm_admin'])) {
             $allUsers->where(['id' => $currentUser->id]);
             $user_id = $currentUser->id;
+        } else if (!is_null($user_id)) {
+            $allUsers->where(['id' => $user_id]);
         }
         $dropdownData = [
             'user' => $allUsers->all()->toArray(),
diff --git a/templates/UserSettings/add.php b/templates/UserSettings/add.php
index 38a14c8..a691afc 100644
--- a/templates/UserSettings/add.php
+++ b/templates/UserSettings/add.php
@@ -9,8 +9,7 @@
                     'type' => 'dropdown',
                     'label' => __('User'),
                     'options' => $dropdownData['user'],
-                    'value' => !empty($user_id) ? $user_id : '',
-                    'disabled' => !empty($user_id),
+                    'value' => !is_null($user_id) ? $user_id : '',
                 ],
                 [
                     'field' => 'name',