diff --git a/app/models/user.rb b/app/models/user.rb
index 639a55cc5..20c26359e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -35,7 +35,8 @@ class User
   many :aspects, :class_name => 'Aspect'
 
 
-  after_create :setup_person
+  before_create :setup_person
+  after_create :set_diaspora_handle
 
   before_validation :do_bad_things 
   before_save :downcase_username
@@ -313,9 +314,12 @@ class User
 
   def setup_person
     self.person.serialized_key ||= User.generate_key.export
-    self.person.diaspora_handle ||= self.diaspora_handle
     self.person.save!
   end
+  
+  def set_diaspora_handle
+    self.person.diaspora_handle ||= self.diaspora_handle
+  end
 
   def downcase_username
     username.downcase!
diff --git a/db/seeds/backer.rb b/db/seeds/backer.rb
index 72aecaeff..1deb18f74 100644
--- a/db/seeds/backer.rb
+++ b/db/seeds/backer.rb
@@ -21,7 +21,7 @@ def create
   backer_number = YAML.load_file(Rails.root.join('config','backer_number.yml'))[:seed_number].to_i
   # Create seed user
   username = backer_info[backer_number]['username'].gsub(/ /,'').downcase
-  user = User.create( :email => "#{username}@#{username}.joindiaspora.com",
+  user = User.create(:email => "#{username}@#{username}.joindiaspora.com",
                      :username => username,
                      :password => "#{username+backer_info[backer_number]['pin'].to_s}",
                      :url=> "http://#{username}.joindiaspora.com/",