diff --git a/app/models/user.rb b/app/models/user.rb
index 8981fbee0..b026458da 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -119,15 +119,8 @@ class User
   
   ###Helpers############
   def self.instantiate( opts = {} )
-    User.create(
-      :email => opts[:email],
-      :password => opts[:password],
-      :password_confirmation => opts[:password_confirmation],
-      :person => Person.new(
-        :email => opts[:email],
-        :profile => Profile.new(
-          :first_name => opts[:first_name],
-          :last_name => opts[:last_name])))
+    opts[:person][:email] = opts[:email]
+    User.create( opts)
   end
 
   def terse_url
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index bcdf97db7..b32581afc 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -15,8 +15,10 @@ describe User do
     user = User.instantiate(:email => "bob@bob.com",
                             :password => "password",
                             :password_confirmation => "password",
-                            :first_name => "bob",
-                            :last_name => "grimm")
+                            :person => 
+                              {:profile => {
+                                :first_name => "bob",
+                                :last_name => "grimm"}})
 
     user.save.should be true
     user.person.should_not be nil