diff --git a/controllers/UsersController.inc b/controllers/UsersController.inc
index ca5f0412..d7d5bd45 100644
--- a/controllers/UsersController.inc
+++ b/controllers/UsersController.inc
@@ -433,7 +433,8 @@
 				if($this->Users->usernameExists($username, $user['id'])) {
 					$validation = $this->Validation->addValidationResult($validation, 'username', 'exist', true);
 				}
-				if(!empty($this->request->getPostParam('password'))) {
+				$password = $this->request->getPostParam('password');
+				if(!empty($password)) {
 					$validation = $this->Validation->addValidationResults($validation,
 						'password',
 						$this->Validation->validateParam(