diff --git a/module/user/model.php b/module/user/model.php
index 48cc74befe..eea5c31733 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -862,7 +862,7 @@ class userModel extends model
         $_POST['password1'] = trim($_POST['password1']);
         $_POST['password2'] = trim($_POST['password2']);
         if(!$canNoPassword and empty($_POST['password1'])) dao::$errors['password1'][] = sprintf($this->lang->error->notempty, $this->lang->user->password) . '<br/>';
-        if(!$canNoPassword and $this->post->password1 != false)
+        if(!empty($_POST['password1']))
         {
             if(isset($this->config->safe->mode) and ($this->post->passwordStrength < $this->config->safe->mode)) dao::$errors['password1'][] = zget($this->lang->user->placeholder->passwordStrengthCheck, $this->config->safe->mode, $this->lang->user->weakPassword) . '<br/>';