diff --git a/app/controllers/api/v1/accounts/google/authorizations_controller.rb b/app/controllers/api/v1/accounts/google/authorizations_controller.rb
index 1755ba4da..87a7cfa3f 100644
--- a/app/controllers/api/v1/accounts/google/authorizations_controller.rb
+++ b/app/controllers/api/v1/accounts/google/authorizations_controller.rb
@@ -5,7 +5,7 @@ class Api::V1::Accounts::Google::AuthorizationsController < Api::V1::Accounts::O
     redirect_url = google_client.auth_code.authorize_url(
       {
         redirect_uri: "#{base_url}/google/callback",
-        scope: 'email profile https://mail.google.com/',
+        scope: scope,
         response_type: 'code',
         prompt: 'consent', # the oauth flow does not return a refresh token, this is supposed to fix it
         access_type: 'offline', # the default is 'online'
diff --git a/app/controllers/api/v1/accounts/microsoft/authorizations_controller.rb b/app/controllers/api/v1/accounts/microsoft/authorizations_controller.rb
index 597019c75..a300b5f59 100644
--- a/app/controllers/api/v1/accounts/microsoft/authorizations_controller.rb
+++ b/app/controllers/api/v1/accounts/microsoft/authorizations_controller.rb
@@ -5,7 +5,7 @@ class Api::V1::Accounts::Microsoft::AuthorizationsController < Api::V1::Accounts
     redirect_url = microsoft_client.auth_code.authorize_url(
       {
         redirect_uri: "#{base_url}/microsoft/callback",
-        scope: 'offline_access https://outlook.office.com/IMAP.AccessAsUser.All https://outlook.office.com/SMTP.Send openid profile',
+        scope: scope,
         state: state,
         prompt: 'consent'
       }
diff --git a/app/controllers/api/v1/accounts/oauth_authorization_controller.rb b/app/controllers/api/v1/accounts/oauth_authorization_controller.rb
index 84298d3bc..feb218b59 100644
--- a/app/controllers/api/v1/accounts/oauth_authorization_controller.rb
+++ b/app/controllers/api/v1/accounts/oauth_authorization_controller.rb
@@ -1,6 +1,12 @@
 class Api::V1::Accounts::OauthAuthorizationController < Api::V1::Accounts::BaseController
   before_action :check_authorization
 
+  protected
+
+  def scope
+    ''
+  end
+
   def state
     Current.account.to_sgid(expires_in: 15.minutes).to_s
   end
@@ -14,4 +20,4 @@ class Api::V1::Accounts::OauthAuthorizationController < Api::V1::Accounts::BaseC
   def check_authorization
     raise Pundit::NotAuthorizedError unless Current.account_user.administrator?
   end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/concerns/google_concern.rb b/app/controllers/concerns/google_concern.rb
index 474b14aec..13de7ced3 100644
--- a/app/controllers/concerns/google_concern.rb
+++ b/app/controllers/concerns/google_concern.rb
@@ -14,7 +14,7 @@ module GoogleConcern
 
   private
 
-  def base_url
-    ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
+  def scope
+    'email profile https://mail.google.com/'
   end
 end
diff --git a/app/controllers/concerns/microsoft_concern.rb b/app/controllers/concerns/microsoft_concern.rb
index 507b9f8a3..53a5a4f1b 100644
--- a/app/controllers/concerns/microsoft_concern.rb
+++ b/app/controllers/concerns/microsoft_concern.rb
@@ -15,7 +15,7 @@ module MicrosoftConcern
 
   private
 
-  def base_url
-    ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
+  def scope
+    'offline_access https://outlook.office.com/IMAP.AccessAsUser.All https://outlook.office.com/SMTP.Send openid profile'
   end
 end