diff --git a/app/models/user.rb b/app/models/user.rb
index 9b43eb3c4..17769cea6 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -18,6 +18,7 @@ class User
 
   before_validation_on_create :setup_person
   before_create :pivotal_or_diaspora_only 
+  after_create :seed_groups
 
   ######## Making things work ########
   key :email, String
@@ -298,6 +299,10 @@ class User
   def tommy?
     email.include?("tommy@pivotallabs.com") || email.include?("tsullivan@pivotallabs.com")
   end
+
+  def seed_groups
+    group(:name => "pivots")
+  end
   protected
   
   def setup_person