diff --git a/app/models/user.rb b/app/models/user.rb
index 1fdf6fe6e..520cbc77c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -372,6 +372,10 @@ class User
 
   def setup(opts)
     self.username = opts[:username]
+    self.valid?
+    errors = self.errors
+    errors.delete :person
+    return if errors.size > 0
 
     opts[:person] ||= {}
     opts[:person][:profile] ||= Profile.new
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index c4fb6d472..464787133 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -216,7 +216,6 @@ describe User do
         lambda { User.build(@invalid_params) }.should_not change(Person, :count)
       end
       it 'does not generate a key' do
-        pending 'Validate users before generating keys'
         User.should_receive(:generate_key).exactly(0).times
         User.build(@invalid_params)
       end