diff --git a/models/user.php b/models/user.php
index 49d19a89b..e93bd6314 100644
--- a/models/user.php
+++ b/models/user.php
@@ -109,8 +109,8 @@ public function __construct($id = false, $table = null, $ds = null) {
 					'message' => __d('users', 'This email is already in use.', true))),
 			'passwd' => array(
 				'to_short' => array(
-					'rule' => array('minLength', '4'),
-					'message' => __d('users', 'The password must have at least 8 characters.', true)),
+					'rule' => array('minLength', '6'),
+					'message' => __d('users', 'The password must have at least 6 characters.', true)),
 				'required' => array(
 					'rule' => 'notEmpty',
 					'message' => __d('users', 'Please enter a password.', true))),
diff --git a/views/users/register.ctp b/views/users/register.ctp
index 308b6c1a6..5aa824bd4 100644
--- a/views/users/register.ctp
+++ b/views/users/register.ctp
@@ -14,7 +14,7 @@
 <fieldset>
 	<legend><?php __d('users', 'Details');?></legend>
 	<?php
-		if (!isset($openIdAuthData)) {
+		if (empty($openIdAuthData)) {
 			echo $this->Form->create($model, array('url' => array('action'=>'register')));
 			echo $this->Form->input('username', array(
 				'error' => 	array(