diff --git a/libraries/cms/form/field/user.php b/libraries/cms/form/field/user.php
index 71bf2d18d0052..a403731fae388 100644
--- a/libraries/cms/form/field/user.php
+++ b/libraries/cms/form/field/user.php
@@ -70,8 +70,15 @@ protected function getInput()
 
 		// Load the current username if available.
 		$table = JTable::getInstance('user');
-		if ($this->value)
+
+		if (is_numeric($this->value))
+		{
+			$table->load($this->value);
+		}
+		// Handle the special case for "current".
+		elseif (strtoupper($this->value) == 'CURRENT')
 		{
+			$this->value = JFactory::getUser()->id;
 			$table->load($this->value);
 		}
 		else
@@ -98,7 +105,7 @@ protected function getInput()
 		$html[] = '</div>';
 
 		// Create the real field, hidden, that stored the user id.
-		$html[] = '<input type="hidden" id="' . $this->id . '_id" name="' . $this->name . '" value="' . (int) $this->value . '" />';
+		$html[] = '<input type="hidden" id="' . $this->id . '_id" name="' . $this->name . '" value="' . $this->value . '" />';
 
 		return implode("\n", $html);
 	}