diff --git a/src/users/user.php b/src/users/user.php
index 9c61e06..8fd0674 100644
--- a/src/users/user.php
+++ b/src/users/user.php
@@ -19,6 +19,14 @@
  */
 class UsersApiResourceUser extends ApiResource
 {
+	/**
+	 * Array of fields to be unset
+	 *
+	 * @var    array
+	 * @since  2.0.1
+	 */
+	private $fieldsToSanitize = array('password', 'password_clear', 'otpKey', 'otep');
+
 	/**
 	 * Function to create and edit user record.
 	 *
@@ -33,7 +41,6 @@ public function post()
 		$formData       = $app->input->getArray();
 		$userIdentifier = $app->input->get('id', 0, 'string');
 
-		// If fields are set, pass it to com_fields
 		if (isset($formData['fields']))
 		{
 			$formData['com_fields'] = $formData['fields'];
@@ -42,6 +49,7 @@ public function post()
 
 		// Get current logged in user.
 		$me = $this->plugin->get('user');
+		$iAmSuperAdmin = $me->authorise('core.create');
 
 		if (!empty($userIdentifier))
 		{
@@ -49,8 +57,6 @@ public function post()
 
 			if (!empty($user->id))
 			{
-				$iAmSuperAdmin = $me->authorise('core.admin');
-
 				// Check if regular user is trying to update his/her own profile OR if user is superadmin
 				if ($me->id == $user->id || $iAmSuperAdmin)
 				{
@@ -88,6 +94,13 @@ public function post()
 		// Check if $userIdentifier is not set - POST / CREATE user case
 		else
 		{
+			if (!$iAmSuperAdmin)
+			{
+				ApiError::raiseError(400, JText::_('JERROR_ALERTNOAUTHOR'));
+
+				return;
+			}
+
 			// Validate required fields
 			if ($formData['username'] == '' || $formData['name'] == '' || $formData['email'] == '')
 			{
@@ -116,24 +129,21 @@ public function post()
 	/**
 	 * Funtion to remove sensitive user info fields like password
 	 *
-	 * @param   Object  $user    The user object.
-	 * @param   Array   $fields  Array of fields to be unset
+	 * @param   Object  &$user  The user object.
 	 *
 	 * @return  object|void  $user
 	 *
 	 * @since   2.0.1
 	 */
-	protected function sanitizeUserFields($user, $fields = array('password', 'password_clear', 'otpKey', 'otep'))
+	protected function sanitizeUserFields(&$user)
 	{
-		foreach ($fields as $f)
+		foreach ($this->fieldsToSanitize as $f)
 		{
 			if (isset($user->{$f}))
 			{
 				unset($user->{$f});
 			}
 		}
-
-		return $user;
 	}
 
 	/**
@@ -174,7 +184,7 @@ public function get()
 			}
 		}
 
-		$user = $this->sanitizeUserFields($user);
+		$this->sanitizeUserFields($user);
 
 		$this->plugin->setResponse($user);
 	}
@@ -335,7 +345,7 @@ private function retriveUser($userIdentifier)
 
 		// Flag to differentiate the column value
 		$app            = JFactory::getApplication();
-		$xIdentifier    = $app->input->server->get('HTTP_X_IDENTIFIER', '', 'string');
+		$xIdentifier    = $app->input->server->get('HTTP_X_IDENTIFIER', '', 'WORD');
 
 		switch ($xIdentifier)
 		{