diff --git a/db/seeds/backer.rb b/db/seeds/backer.rb
index 4708871aa..d06379762 100644
--- a/db/seeds/backer.rb
+++ b/db/seeds/backer.rb
@@ -51,11 +51,11 @@ def create(backer_number)
 
 
   # Create seed user
-  email = backer_info[backer_number][2].gsub(/ /,'').downcase
-  user = User.create( :email => "#{email}@joindiaspora.com",
-                     :password => "#{email+backer_info[backer_number][0].to_s}",
+  username = backer_info[backer_number][2].gsub(/ /,'').downcase
+  user = User.create( :email => "#{username}@#{username}joindiaspora.com",
+                     :password => "#{username+backer_info[backer_number][0].to_s}",
                      :profile => Profile.new( :first_name => backer_info[backer_number][1], :last_name => backer_info[backer_number][2] ),
-                    :url=> "#{email}.joindiaspora.com")
+                    :url=> "#{username}.joindiaspora.com")
 
   # Make connection with Diaspora Tom
   User.owner.send_friend_request_to('http://tom.joindiaspora.com/')
diff --git a/db/seeds/dev.rb b/db/seeds/dev.rb
index dae6ae374..1c285c59b 100644
--- a/db/seeds/dev.rb
+++ b/db/seeds/dev.rb
@@ -51,8 +51,8 @@ names = [ ["George", "Washington"],
 
 # Make people
 (0..10).each { |n|
-  email = names[n][1].gsub(/ /,'').downcase
-  Person.create( :email => "#{email}@joindiaspora.com", :url => "http://#{email}.joindiaspora.com/", :active => true, :profile => Profile.new(:first_name => names[n][0], :last_name => names[n][1]))
+  username = names[n][1].gsub(/ /,'').downcase
+  Person.create( :email => "#{username}@#{username}joindiaspora.com", :url => "http://#{username}.joindiaspora.com/", :active => true, :profile => Profile.new(:first_name => names[n][0], :last_name => names[n][1]))
 }
 
 
diff --git a/db/seeds/tom.rb b/db/seeds/tom.rb
index b6aed413e..364580fed 100644
--- a/db/seeds/tom.rb
+++ b/db/seeds/tom.rb
@@ -9,7 +9,7 @@
 require 'config/environment'
 
 # Create seed user
-user = User.create( :email => "tom@joindiaspora.com", :password => "evankorth", :url => "http://tom.joindiaspora.com/", :profile => Profile.new( :first_name => "Alexander", :last_name => "Hamiltom" ))
+user = User.create( :email => "tom@tom.joindiaspora.com", :password => "evankorth", :url => "http://tom.joindiaspora.com/", :profile => Profile.new( :first_name => "Alexander", :last_name => "Hamiltom" ))
 
 names = [ ["George", "Washington"],
           ["John", "Adams"],