diff --git a/app/controllers/public/account_controller.rb b/app/controllers/public/account_controller.rb
index 9711506..0fe8bc0 100644
--- a/app/controllers/public/account_controller.rb
+++ b/app/controllers/public/account_controller.rb
@@ -77,6 +77,8 @@ class AccountController < ApplicationController
     end
     rescue ActiveRecord::RecordInvalid
       @person.valid?
+      @person.errors.delete(:identifier)
+      @person.errors.delete(:user_id)
       if @wizard
         render :action => 'signup', :layout => 'wizard'
       else
diff --git a/app/views/account/_signup_form.rhtml b/app/views/account/_signup_form.rhtml
index 54366f9..174ea28 100644
--- a/app/views/account/_signup_form.rhtml
+++ b/app/views/account/_signup_form.rhtml
@@ -37,7 +37,7 @@
 
 <div id='signup-password'>
 <%= required f.password_field(:password,
-    :help => help=_('Choose a password that you can remember easily.')) %>
+    :help => help=_('Choose a password that you can remember easily. It must have at least 4 characters.')) %>
 <div class='help-small-msg'><%= help %></div>
 </div>
 
--
libgit2 0.21.2