diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 190c22924fe..d7097eb434c 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -112,7 +112,8 @@ class Users::OmniauthCallbacksController < ApplicationController
   def user_found(user)
     # automatically activate/unstage any account if a provider marked the email valid
     if @auth_result.email_valid && @auth_result.email == user.email
-      user.update!(staged: false, active: true)
+      user.update!(staged: false)
+      user.activate
     end
 
     if ScreenedIpAddress.should_block?(request.remote_ip)