diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 95fa640d61..6c416f4d93 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -650,7 +650,7 @@ class UsersController < ApplicationController
 
   def enqueue_activation_email
     @email_token ||= @user.email_tokens.create(email: @user.email)
-    Jobs.enqueue_in(1.second, :critical_user_email, type: :signup, user_id: @user.id, email_token: @email_token.token)
+    Jobs.enqueue(:critical_user_email, type: :signup, user_id: @user.id, email_token: @email_token.token, to_address: @user.email)
   end
 
   def search_users
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 3a64d6bf2f..1597f4b7e6 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -1498,7 +1498,7 @@ describe UsersController do
           unconfirmed_email_user = Fabricate(:user, active: true)
           unconfirmed_email_user.email_tokens.create(email: unconfirmed_email_user.email)
           session[SessionController::ACTIVATE_USER_KEY] = unconfirmed_email_user.id
-          Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup))
+          Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup, to_address: unconfirmed_email_user.email))
           xhr :post, :send_activation_email, username: unconfirmed_email_user.username
 
           expect(response.status).to eq(200)