diff --git a/lam/lib/modules/sambaAccount.inc b/lam/lib/modules/sambaAccount.inc
index 486be882..022f1e2b 100644
--- a/lam/lib/modules/sambaAccount.inc
+++ b/lam/lib/modules/sambaAccount.inc
@@ -732,7 +732,7 @@ class sambaAccount extends baseModule {
 				0 => array('kind' => 'text', 'text' => _('Repeat password') ),
 				1 => array('kind' => 'input', 'name' => 'lmPassword2', 'type' => 'password', 'size' => '20', 'maxlength' => '255', 'value' => ''),
 				2 => array('kind' => 'help', 'value' => 'password'));
-			if (isset($this->getAccountContainer()->getAccountModule('posixAccount')->getClearTextPassword())) {
+			if ($this->getAccountContainer()->getAccountModule('posixAccount')->getClearTextPassword() != null) {
 				$return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Use Unix password') ),
 					1 => array ( 'kind' => 'input', 'name' => 'useunixpwd', 'type' => 'checkbox', 'checked' => $this->useunixpwd, 'value' => true),
 					2 => array ('kind' => 'help', 'value' => 'pwdUnix'));
diff --git a/lam/lib/modules/sambaSamAccount.inc b/lam/lib/modules/sambaSamAccount.inc
index 565f00c7..b988487c 100644
--- a/lam/lib/modules/sambaSamAccount.inc
+++ b/lam/lib/modules/sambaSamAccount.inc
@@ -897,7 +897,7 @@ class sambaSamAccount extends baseModule {
 				$return[] = array(
 					0 => array('kind' => 'text', 'text' => _('Repeat password')),
 					1 => array('kind' => 'input', 'name' => 'sambaLMPassword2', 'type' => 'password', 'size' => '20', 'maxlength' => '255'));
-				if (isset($this->getAccountContainer()->getAccountModule('posixAccount')->getClearTextPassword())) {
+				if ($this->getAccountContainer()->getAccountModule('posixAccount')->getClearTextPassword() != null) {
 					$return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Use Unix password') ),
 						1 => array ( 'kind' => 'input', 'name' => 'useunixpwd', 'type' => 'checkbox', 'checked' => $this->useunixpwd),
 						2 => array ('kind' => 'help', 'value' => 'useunixpwd'));