1 files changed, 4 insertions, 5 deletions
diff --git a/app/services/emails/create_service.rb b/app/services/emails/create_service.rb
index 56925a724fe..dc06a5caa40 100644
--- a/app/services/emails/create_service.rb
+++ b/app/services/emails/create_service.rb
@@ -3,12 +3,11 @@
 module Emails
   class CreateService < ::Emails::BaseService
     def execute(extra_params = {})
-      skip_confirmation = @params.delete(:skip_confirmation)
+      skip_confirmation = params.delete(:skip_confirmation)
 
-      email = @user.emails.create(@params.merge(extra_params))
-
-      email&.confirm if skip_confirmation && current_user.admin?
-      email
+      user.emails.create(params.merge(extra_params)).tap do |email|
+        email&.confirm if skip_confirmation && current_user.admin?
+      end
     end
   end
 end