diff --git a/administrator/components/com_modules/Field/ModulesModuleField.php b/administrator/components/com_modules/Field/ModulesModuleField.php
index 4c8d1c569ff49..95a7d9c54e82a 100644
--- a/administrator/components/com_modules/Field/ModulesModuleField.php
+++ b/administrator/components/com_modules/Field/ModulesModuleField.php
@@ -41,7 +41,7 @@ class ModulesModuleField extends \JFormFieldList
 	 */
 	public function getOptions()
 	{
-		$clientId = Factory::getApplication()->input->get('client_id', 0, 'int');
+		$clientId = Factory::getApplication()->getUserState('com_modules.modules.client_id', 0);
 		$options  = ModulesHelper::getModules($clientId);
 
 		return array_merge(parent::getOptions(), $options);
diff --git a/administrator/components/com_modules/Field/ModulesPositionField.php b/administrator/components/com_modules/Field/ModulesPositionField.php
index 1207d748f1d62..49e9823011c09 100644
--- a/administrator/components/com_modules/Field/ModulesPositionField.php
+++ b/administrator/components/com_modules/Field/ModulesPositionField.php
@@ -39,7 +39,7 @@ class ModulesPositionField extends ListField
 	 */
 	public function getOptions()
 	{
-		$clientId = Factory::getApplication()->input->get('client_id', 0, 'int');
+		$clientId = Factory::getApplication()->getUserState('com_modules.modules.client_id', 0);
 		$options  = ModulesHelper::getPositions($clientId);
 
 		return array_merge(parent::getOptions(), $options);
diff --git a/administrator/components/com_modules/Field/ModulesPositioneditField.php b/administrator/components/com_modules/Field/ModulesPositioneditField.php
index 1889dbe48f138..a225d6a59d8e7 100644
--- a/administrator/components/com_modules/Field/ModulesPositioneditField.php
+++ b/administrator/components/com_modules/Field/ModulesPositioneditField.php
@@ -49,7 +49,7 @@ protected function getInput()
 	{
 		$data = $this->getLayoutData();
 
-		$clientId  = Factory::getApplication()->input->get('client_id', 0, 'int');
+		$clientId  = Factory::getApplication()->getUserState('com_modules.modules.client_id', 0);
 		$positions = HTMLHelper::_('modules.positions', $clientId, 1, $this->value);
 
 		$data['client']    = $clientId;
diff --git a/administrator/components/com_modules/forms/moduleadmin.xml b/administrator/components/com_modules/forms/moduleadmin.xml
index 526611dcaf792..c63fd538db412 100644
--- a/administrator/components/com_modules/forms/moduleadmin.xml
+++ b/administrator/components/com_modules/forms/moduleadmin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
-	<fieldset>
+	<fieldset addfieldprefix="Joomla\Component\Modules\Administrator\Field">
 		<field 
 			name="id" 
 			type="number"
@@ -90,7 +90,7 @@
 
 		<field
 			name="position" 
-			type="moduleposition"
+			type="ModulesPositionedit"
 			label="COM_MODULES_FIELD_POSITION_LABEL"
 			default=""
 			maxlength="50"