diff --git a/ruby/lib/jam_ruby/app/mailers/invited_user_mailer.rb b/ruby/lib/jam_ruby/app/mailers/invited_user_mailer.rb
index a443f9c6d..ce1a007ac 100644
--- a/ruby/lib/jam_ruby/app/mailers/invited_user_mailer.rb
+++ b/ruby/lib/jam_ruby/app/mailers/invited_user_mailer.rb
@@ -48,7 +48,8 @@ module JamRuby
     end
 
     def generate_signup_url(invited_user)
-      "http://www.jamkazam.com/signup?invitation_code=#{invited_user.invitation_code}"
+      invited_user.generate_signup_url
+      # "http://www.jamkazam.com/signup?invitation_code=#{invited_user.invitation_code}"
     end
   end
 end
diff --git a/ruby/lib/jam_ruby/models/invited_user.rb b/ruby/lib/jam_ruby/models/invited_user.rb
index d96aec775..579766cf7 100644
--- a/ruby/lib/jam_ruby/models/invited_user.rb
+++ b/ruby/lib/jam_ruby/models/invited_user.rb
@@ -62,6 +62,15 @@ module JamRuby
     def invited_by_administrator?
       sender.nil? || sender.admin # a nil sender can only be created by someone using jam-admin
     end
+
+    def generate_signup_url
+      if 'development'==Rails.env
+        "http://jamkazamdev.local:3000/signup?invitation_code=#{self.invitation_code}"
+      else
+        "http://www.jamkazam.com/signup?invitation_code=#{self.invitation_code}"
+      end
+    end
+
     private
 
     def can_invite?