diff --git a/src/46b98346-ec98-42b3-a393-96c7d1282b1c/code.php b/src/46b98346-ec98-42b3-a393-96c7d1282b1c/code.php
index 9ff8918..06682d9 100644
--- a/src/46b98346-ec98-42b3-a393-96c7d1282b1c/code.php
+++ b/src/46b98346-ec98-42b3-a393-96c7d1282b1c/code.php
@@ -350,15 +350,14 @@ final class UsersSubform implements GuidInterface, SubformInterface
 						$item[$indexKey] = 0;
 					}
 					break;
-				case 'user_id':
-					$item[$indexKey] = $this->setUserDetails($item);
-					break;
 				default:
 					// No action for other keys if empty
 					break;
 			}
 			// set LINK
 			$item[$linkKey] = $linkValue;
+			// create/update user
+			$item['user_id'] = $this->setUserDetails($item);
 		}
 
 		return array_values($items);
diff --git a/src/46b98346-ec98-42b3-a393-96c7d1282b1c/code.power b/src/46b98346-ec98-42b3-a393-96c7d1282b1c/code.power
index 4c477e5..d13d14a 100644
--- a/src/46b98346-ec98-42b3-a393-96c7d1282b1c/code.power
+++ b/src/46b98346-ec98-42b3-a393-96c7d1282b1c/code.power
@@ -321,15 +321,14 @@
 						$item[$indexKey] = 0;
 					}
 					break;
-				case 'user_id':
-					$item[$indexKey] = $this->setUserDetails($item);
-					break;
 				default:
 					// No action for other keys if empty
 					break;
 			}
 			// set LINK
 			$item[$linkKey] = $linkValue;
+			// create/update user
+			$item['user_id'] = $this->setUserDetails($item);
 		}
 
 		return array_values($items);
diff --git a/src/7832a726-87b6-4e95-887e-7b725d3fab8f/code.php b/src/7832a726-87b6-4e95-887e-7b725d3fab8f/code.php
index d85a3fc..4a26046 100644
--- a/src/7832a726-87b6-4e95-887e-7b725d3fab8f/code.php
+++ b/src/7832a726-87b6-4e95-887e-7b725d3fab8f/code.php
@@ -18,6 +18,8 @@ use Joomla\CMS\User\User;
 use Joomla\CMS\User\UserHelper as JoomlaUserHelper;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use VDM\Joomla\Utilities\Component\Helper as Component;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 
 
diff --git a/src/7832a726-87b6-4e95-887e-7b725d3fab8f/settings.json b/src/7832a726-87b6-4e95-887e-7b725d3fab8f/settings.json
index 9f950db..5cb34b1 100644
--- a/src/7832a726-87b6-4e95-887e-7b725d3fab8f/settings.json
+++ b/src/7832a726-87b6-4e95-887e-7b725d3fab8f/settings.json
@@ -4,14 +4,7 @@
     "extends": "",
     "guid": "7832a726-87b6-4e95-887e-7b725d3fab8f",
     "implements": null,
-    "load_selection": {
-        "load_selection0": {
-            "load": "0a59c65c-9daf-4bc9-baf4-e063ff9e6a8a"
-        },
-        "load_selection1": {
-            "load": "1f28cb53-60d9-4db1-b517-3c7dc6b429ef"
-        }
-    },
+    "load_selection": null,
     "name": "UserHelper",
     "power_version": "1.0.0",
     "system_name": "Joomla.Utilities.UserHelper",
@@ -20,6 +13,14 @@
         "use_selection0": {
             "use": "640b5352-fb09-425f-a26e-cd44eda03f15",
             "as": "Component"
+        },
+        "use_selection1": {
+            "use": "0a59c65c-9daf-4bc9-baf4-e063ff9e6a8a",
+            "as": "default"
+        },
+        "use_selection2": {
+            "use": "1f28cb53-60d9-4db1-b517-3c7dc6b429ef",
+            "as": "default"
         }
     },
     "extendsinterfaces": null,