diff --git a/lam/lib/modules/inetOrgPerson.inc b/lam/lib/modules/inetOrgPerson.inc
index bcfaf76f..c0cf3855 100644
--- a/lam/lib/modules/inetOrgPerson.inc
+++ b/lam/lib/modules/inetOrgPerson.inc
@@ -673,7 +673,7 @@ class inetOrgPerson extends baseModule {
 		if ( !get_preg($this->attributes['title'][0], 'title')) $errors[] = $this->messages['title'][0];
 		if ( !get_preg($this->attributes['employeeType'][0], 'employeeType')) $errors[] = $this->messages['employeeType'][0];
 		if ( !get_preg($this->attributes['businessCategory'][0], 'businessCategory')) $errors[] = $this->messages['businessCategory'][0];
-		if (isset($_POST['userPassword'])) {
+		if (isset($_POST['userPassword']) && ($_POST['userPassword'] != '')) {
 			if ($_POST['userPassword'] != $_POST['userPassword2']) {
 				$errors[] = $this->messages['userPassword'][0];
 			}