diff --git a/lib/jam_ruby/models/invited_user.rb b/lib/jam_ruby/models/invited_user.rb
index 98465c015..69711a941 100644
--- a/lib/jam_ruby/models/invited_user.rb
+++ b/lib/jam_ruby/models/invited_user.rb
@@ -51,7 +51,7 @@ module JamRuby
     private
 
     def can_invite?
-      errors.add(:sender, "can not invite others") if !sender.can_invite?
+      errors.add(:sender, "can not invite others") if !invited_by_administrator? && !sender.can_invite?
     end
 
     def valid_personalized_invitation
diff --git a/lib/jam_ruby/models/invited_user_observer.rb b/lib/jam_ruby/models/invited_user_observer.rb
index acb4fca69..a4a007a93 100644
--- a/lib/jam_ruby/models/invited_user_observer.rb
+++ b/lib/jam_ruby/models/invited_user_observer.rb
@@ -3,7 +3,7 @@ module JamRuby
 
     observe JamRuby::InvitedUser
 
-    def after_save(invited_user)
+    def after_create(invited_user)
       if invited_user.sender.nil?
         InvitedUserMailer.welcome_betauser(invited_user).deliver
       else