diff --git a/app/models/email_token.rb b/app/models/email_token.rb
index dc511fbc7..0d02e0d16 100644
--- a/app/models/email_token.rb
+++ b/app/models/email_token.rb
@@ -57,6 +57,8 @@ class EmailToken < ActiveRecord::Base
         user.save!
       end
     end
+    # redeem invite, if available
+    Invite.redeem_from_email(user.email)
     user
   rescue ActiveRecord::RecordInvalid
     # If the user's email is already taken, just return nil (failure)
diff --git a/app/models/invite.rb b/app/models/invite.rb
index bbdf5edbd..f60a69f16 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -130,6 +130,14 @@ class Invite < ActiveRecord::Base
     i
   end
 
+  def self.redeem_from_email(email)
+    invite = Invite.find_by(email: Email.downcase(email))
+    if invite
+      InviteRedeemer.new(invite).redeem
+    end
+    invite
+  end
+
   def self.base_directory
     File.join(Rails.root, "public", "csv", RailsMultisite::ConnectionManagement.current_db)
   end
diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb
index 19cf4d367..b4ec857df 100644
--- a/app/models/invite_redeemer.rb
+++ b/app/models/invite_redeemer.rb
@@ -19,6 +19,10 @@ InviteRedeemer = Struct.new(:invite) do
 
   # extracted from User cause it is very specific to invites
   def self.create_user_from_invite(invite)
+
+    user_exists = User.find_by_email(invite.email)
+    return user if user_exists
+
     username = UserNameSuggester.suggest(invite.email)
 
     DiscourseHub.username_operation do
diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb
index 5e936aca8..82704203f 100644
--- a/spec/models/invite_spec.rb
+++ b/spec/models/invite_spec.rb
@@ -349,4 +349,24 @@ describe Invite do
       result.should be_valid
     end
   end
+
+  describe '.redeem_from_email' do
+    let(:inviter) { Fabricate(:user) }
+    let(:invite) { Fabricate(:invite, invited_by: inviter, email: 'test@example.com', user_id: nil) }
+    let(:user) { Fabricate(:user, email: invite.email) }
+
+    it 'redeems the invite from email' do
+      result = Invite.redeem_from_email(user.email)
+      invite.reload
+      invite.should be_redeemed
+    end
+
+    it 'does not redeem the invite if email does not match' do
+      result = Invite.redeem_from_email('test24@example.com')
+      invite.reload
+      invite.should_not be_redeemed
+    end
+
+  end
+
 end