diff --git a/app/controllers/ldap/omniauth_callbacks_controller.rb b/app/controllers/ldap/omniauth_callbacks_controller.rb
index 4c9439de780436a7d00ef903a689267ba2142b36..1c79bd3a668e1283ec7ebe8f84af03e9442ac32b 100644
--- a/app/controllers/ldap/omniauth_callbacks_controller.rb
+++ b/app/controllers/ldap/omniauth_callbacks_controller.rb
@@ -22,9 +22,7 @@ def ldap
       return admin_mode_flow(Gitlab::Auth::Ldap::User) if current_user_mode.admin_mode_requested?
     end
 
-    Namespace.with_disabled_organization_validation do
-      sign_in_user_flow(Gitlab::Auth::Ldap::User)
-    end
+    sign_in_user_flow(Gitlab::Auth::Ldap::User)
   end
 
   define_providers!
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index db99cda2a1801167cffdc0e209eee2e7475e637c..d24a0f509525ab632e97a071ba360b5ccb26191b 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -165,9 +165,7 @@ def omniauth_flow(auth_module, identity_linker: nil)
         redirect_identity_exists
       end
     else
-      Namespace.with_disabled_organization_validation do
-        sign_in_user_flow(auth_module::User)
-      end
+      sign_in_user_flow(auth_module::User)
     end
   end
 
@@ -200,7 +198,7 @@ def redirect_authorize_identity_link(identity_linker)
 
   def build_auth_user(auth_user_class)
     strong_memoize_with(:build_auth_user, auth_user_class) do
-      auth_user_class.new(oauth)
+      auth_user_class.new(oauth, { organization_id: Current.organization_id })
     end
   end
 
diff --git a/ee/lib/ee/gitlab/auth/ldap/user.rb b/ee/lib/ee/gitlab/auth/ldap/user.rb
index ff9155c8f47bd58d2c9cad381671d2e4a11176f6..8b2b626f0303415f00682a95b680e02d13809ac0 100644
--- a/ee/lib/ee/gitlab/auth/ldap/user.rb
+++ b/ee/lib/ee/gitlab/auth/ldap/user.rb
@@ -9,7 +9,7 @@ module Gitlab
     module Auth
       module Ldap
         module User
-          def initialize(auth_hash)
+          def initialize(auth_hash, user_params = {})
             super
 
             set_external_with_external_groups
diff --git a/ee/lib/gitlab/auth/group_saml/user.rb b/ee/lib/gitlab/auth/group_saml/user.rb
index 787596b50d09f96e79631a32c62ae01cb12e71ce..a5ca734f48e0c56bdf1765b0750b1a2477ea9691 100644
--- a/ee/lib/gitlab/auth/group_saml/user.rb
+++ b/ee/lib/gitlab/auth/group_saml/user.rb
@@ -11,7 +11,8 @@ class User < Gitlab::Auth::OAuth::User
         attr_reader :auth_hash
 
         override :initialize
-        def initialize(auth_hash)
+        def initialize(auth_hash, user_params = {})
+          @user_params = user_params
           @auth_hash = AuthHash.new(auth_hash)
         end
 
diff --git a/ee/lib/gitlab/auth/oidc/user.rb b/ee/lib/gitlab/auth/oidc/user.rb
index 16d2414a287da7838f996e774d3334c2c1e1578b..123f9bfbbe2b73a91779f3f942cb27599686d6ec 100644
--- a/ee/lib/gitlab/auth/oidc/user.rb
+++ b/ee/lib/gitlab/auth/oidc/user.rb
@@ -9,7 +9,7 @@ module Gitlab
   module Auth
     module Oidc
       class User < OAuth::User
-        def initialize(auth_hash)
+        def initialize(auth_hash, user_params = {})
           provider_name = auth_hash.provider
           @oidc_config = Config.options_for(provider_name)
 
diff --git a/ee/spec/controllers/ee/omniauth_callbacks_controller_spec.rb b/ee/spec/controllers/ee/omniauth_callbacks_controller_spec.rb
index d030aacd596a1b755b34c854c9b027dea0a0b464..9a937cf661a069eb99e3f297c6c002dec897f4d5 100644
--- a/ee/spec/controllers/ee/omniauth_callbacks_controller_spec.rb
+++ b/ee/spec/controllers/ee/omniauth_callbacks_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe OmniauthCallbacksController, type: :controller, feature_category: :system_access do
+RSpec.describe OmniauthCallbacksController, :with_current_organization, type: :controller, feature_category: :system_access do
   include LoginHelpers
 
   let_it_be(:extern_uid) { 'my-uid' }
diff --git a/ee/spec/controllers/groups/omniauth_callbacks_controller_spec.rb b/ee/spec/controllers/groups/omniauth_callbacks_controller_spec.rb
index f34c623016632c7339961e0ab50e8d75a975bb4c..0f2c39366c7fd9903077d714e3fb45434adb6c00 100644
--- a/ee/spec/controllers/groups/omniauth_callbacks_controller_spec.rb
+++ b/ee/spec/controllers/groups/omniauth_callbacks_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Groups::OmniauthCallbacksController, :aggregate_failures, feature_category: :system_access do
+RSpec.describe Groups::OmniauthCallbacksController, :with_current_organization, :aggregate_failures, feature_category: :system_access do
   include LoginHelpers
   include ForgeryProtection
 
diff --git a/ee/spec/controllers/ldap/omniauth_callbacks_controller_spec.rb b/ee/spec/controllers/ldap/omniauth_callbacks_controller_spec.rb
index e005636b2b8a54ba207d221828f3a7a7e827719a..ecbbe0f2bea64a5c58375d6f4b8c8b8793b2e6c2 100644
--- a/ee/spec/controllers/ldap/omniauth_callbacks_controller_spec.rb
+++ b/ee/spec/controllers/ldap/omniauth_callbacks_controller_spec.rb
@@ -19,7 +19,7 @@
     expect(flash[:notice]).to eq nil
   end
 
-  context 'for sign up', :aggregate_failures do
+  context 'for sign up', :with_current_organization, :aggregate_failures do
     let(:user) { build_stubbed(:user) }
 
     before do
diff --git a/ee/spec/features/registrations/identity_verification_spec.rb b/ee/spec/features/registrations/identity_verification_spec.rb
index aa0febd4964e5f51830ee3ec5200fe37a6f74d0f..f89209d27fa372d55ee9a4a4555a66a4c7976440 100644
--- a/ee/spec/features/registrations/identity_verification_spec.rb
+++ b/ee/spec/features/registrations/identity_verification_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Identity Verification', :js, feature_category: :instance_resiliency do
+RSpec.describe 'Identity Verification', :js, :with_current_organization, feature_category: :instance_resiliency do
   include IdentityVerificationHelpers
 
   before do
diff --git a/ee/spec/features/registrations/saas/standard_flow_company_joining_project_spec.rb b/ee/spec/features/registrations/saas/standard_flow_company_joining_project_spec.rb
index aa8b6c975224fdf83ab9ca3f1f787f9ccb398d28..2b55eca648bb765979a24b61fb4182a6d0b2cac9 100644
--- a/ee/spec/features/registrations/saas/standard_flow_company_joining_project_spec.rb
+++ b/ee/spec/features/registrations/saas/standard_flow_company_joining_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Standard flow for user picking company and joining a project', :js, :saas_registration, feature_category: :onboarding do
+RSpec.describe 'Standard flow for user picking company and joining a project', :js, :saas_registration, :with_current_organization, feature_category: :onboarding do
   where(:case_name, :sign_up_method) do
     [
       ['with regular sign up', -> { regular_sign_up }],
diff --git a/ee/spec/features/registrations/saas/standard_flow_just_me_importing_project_spec.rb b/ee/spec/features/registrations/saas/standard_flow_just_me_importing_project_spec.rb
index 13fda8ba48d870a137e27ae958dff97d5f23945e..fe8727633f56f26f7001ca1580ad91868cde3b96 100644
--- a/ee/spec/features/registrations/saas/standard_flow_just_me_importing_project_spec.rb
+++ b/ee/spec/features/registrations/saas/standard_flow_just_me_importing_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Standard flow for user picking just me and importing a project', :js, :saas_registration, feature_category: :onboarding do
+RSpec.describe 'Standard flow for user picking just me and importing a project', :js, :saas_registration, :with_default_organization, feature_category: :onboarding do
   where(:case_name, :sign_up_method) do
     [
       ['with regular sign up', -> { regular_sign_up }],
diff --git a/ee/spec/features/registrations/saas/standard_flow_just_me_joining_project_spec.rb b/ee/spec/features/registrations/saas/standard_flow_just_me_joining_project_spec.rb
index 295180ccbae2ad070c50084ed02d43d3c36fe1a4..91a27bd4efd93d221792856f701d3f3571df0177 100644
--- a/ee/spec/features/registrations/saas/standard_flow_just_me_joining_project_spec.rb
+++ b/ee/spec/features/registrations/saas/standard_flow_just_me_joining_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Standard flow for user picking just me and joining a project', :js, :saas_registration, feature_category: :onboarding do
+RSpec.describe 'Standard flow for user picking just me and joining a project', :js, :saas_registration, :with_current_organization, feature_category: :onboarding do
   where(:case_name, :sign_up_method) do
     [
       ['with regular sign up', -> { regular_sign_up }],
diff --git a/ee/spec/features/registrations/saas/subscription_flow_company_paid_plan_spec.rb b/ee/spec/features/registrations/saas/subscription_flow_company_paid_plan_spec.rb
index 52588368a9f1653821dcfa1829dbd38b74556566..99b82ca3397073195ad4bc032a596ea66ae22bec 100644
--- a/ee/spec/features/registrations/saas/subscription_flow_company_paid_plan_spec.rb
+++ b/ee/spec/features/registrations/saas/subscription_flow_company_paid_plan_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Subscription flow for user picking company for paid plan', :js, :saas_registration, feature_category: :onboarding do
+RSpec.describe 'Subscription flow for user picking company for paid plan', :js, :saas_registration, :with_default_organization, feature_category: :onboarding do
   where(:case_name, :sign_up_method) do
     [
       ['with regular sign up', -> { subscription_regular_sign_up }],
diff --git a/ee/spec/features/registrations/saas/subscription_flow_just_me_paid_plan_spec.rb b/ee/spec/features/registrations/saas/subscription_flow_just_me_paid_plan_spec.rb
index 6511f9726b79845d80ff347c5b4639d56d62697a..b6f7d7b08718a331e67daccf01271c41da693c96 100644
--- a/ee/spec/features/registrations/saas/subscription_flow_just_me_paid_plan_spec.rb
+++ b/ee/spec/features/registrations/saas/subscription_flow_just_me_paid_plan_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Subscription flow for user picking just me for paid plan', :js, :saas_registration, feature_category: :onboarding do
+RSpec.describe 'Subscription flow for user picking just me for paid plan', :js, :saas_registration, :with_default_organization, feature_category: :onboarding do
   where(:case_name, :sign_up_method) do
     [
       ['with regular sign up', -> { subscription_regular_sign_up }],
diff --git a/ee/spec/features/registrations/saas/trial_flow_company_importing_project_spec.rb b/ee/spec/features/registrations/saas/trial_flow_company_importing_project_spec.rb
index 8d898d1fade5aec6b1c6ef0a046f3bfa4c5f7ae0..9ab005786d28cf4464203bcbb1d0bd43f1dc5e5e 100644
--- a/ee/spec/features/registrations/saas/trial_flow_company_importing_project_spec.rb
+++ b/ee/spec/features/registrations/saas/trial_flow_company_importing_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Trial flow for user picking company and importing a project', :js, :saas_registration, feature_category: :onboarding do
+RSpec.describe 'Trial flow for user picking company and importing a project', :js, :saas_registration, :with_default_organization, feature_category: :onboarding do
   where(:case_name, :sign_up_method) do
     [
       ['with regular trial sign up', -> { trial_registration_sign_up }],
diff --git a/ee/spec/features/registrations/saas/trial_flow_just_me_importing_project_spec.rb b/ee/spec/features/registrations/saas/trial_flow_just_me_importing_project_spec.rb
index 1108292e1548ae98b8188190f49c5f12bb95d060..e8a7f118144d883505fc54f88e2a2c4b48c82669 100644
--- a/ee/spec/features/registrations/saas/trial_flow_just_me_importing_project_spec.rb
+++ b/ee/spec/features/registrations/saas/trial_flow_just_me_importing_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Trial flow for user picking just me and importing a project', :js, :saas_registration, feature_category: :onboarding do
+RSpec.describe 'Trial flow for user picking just me and importing a project', :js, :saas_registration, :with_default_organization, feature_category: :onboarding do
   where(:case_name, :sign_up_method) do
     [
       ['with regular trial sign up', -> { trial_registration_sign_up }],
diff --git a/ee/spec/lib/gitlab/auth/group_saml/user_spec.rb b/ee/spec/lib/gitlab/auth/group_saml/user_spec.rb
index 832905692cd47e4e0a4a70ba588ed333bf6653e9..5edcad248f6549f1d939c647a80d66c19e99b0be 100644
--- a/ee/spec/lib/gitlab/auth/group_saml/user_spec.rb
+++ b/ee/spec/lib/gitlab/auth/group_saml/user_spec.rb
@@ -2,6 +2,7 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::Auth::GroupSaml::User, :aggregate_failures, feature_category: :system_access do
+  let_it_be(:organization) { create(:organization) }
   let(:uid) { '1234' }
   let(:saml_provider) { create(:saml_provider) }
   let(:group) { saml_provider.group }
@@ -14,7 +15,7 @@
   end
 
   subject(:oauth_user) do
-    oauth_user = described_class.new(auth_hash)
+    oauth_user = described_class.new(auth_hash, organization_id: organization.id)
     oauth_user.saml_provider = saml_provider
 
     oauth_user
diff --git a/ee/spec/lib/gitlab/auth/ldap/user_spec.rb b/ee/spec/lib/gitlab/auth/ldap/user_spec.rb
index be239e2bfa6be6fec04250bd4c585031592ab8e2..26ae1cf70b2452dfa0b4742d42b167ef5c1d3c28 100644
--- a/ee/spec/lib/gitlab/auth/ldap/user_spec.rb
+++ b/ee/spec/lib/gitlab/auth/ldap/user_spec.rb
@@ -5,7 +5,8 @@
 RSpec.describe Gitlab::Auth::Ldap::User do
   include LdapHelpers
 
-  let(:ldap_user) { described_class.new(auth_hash) }
+  let_it_be(:organization) { create(:organization) }
+  let(:ldap_user) { described_class.new(auth_hash, organization_id: organization.id) }
   let(:gl_user) { ldap_user.gl_user }
   let(:info) do
     {
@@ -24,10 +25,6 @@
   let(:external_groups) { [] }
   let!(:fake_proxy) { fake_ldap_sync_proxy(auth_hash.provider) }
 
-  around do |example|
-    Namespace.with_disabled_organization_validation { example.run }
-  end
-
   before do
     allow(fake_proxy).to receive(:dns_for_group_cn).with(group_cn).and_return(group_member_dns)
     stub_ldap_config(external_groups: external_groups)
diff --git a/ee/spec/lib/gitlab/auth/oidc/user_spec.rb b/ee/spec/lib/gitlab/auth/oidc/user_spec.rb
index 86d0cc1c1dd33389db2e6d6293495ab89541b5af..94d2d39835dd3304e388ee5b7b5a7b6a3459de2e 100644
--- a/ee/spec/lib/gitlab/auth/oidc/user_spec.rb
+++ b/ee/spec/lib/gitlab/auth/oidc/user_spec.rb
@@ -3,7 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::Auth::Oidc::User, feature_category: :system_access do
-  let(:oidc_user) { described_class.new(auth_hash) }
+  let_it_be(:organization) { create(:organization) }
+  let(:oidc_user) { described_class.new(auth_hash, organization_id: organization.id) }
   let(:gl_user) { oidc_user.gl_user }
 
   let(:user_groups) { nil }
diff --git a/ee/spec/lib/gitlab/auth/saml/user_spec.rb b/ee/spec/lib/gitlab/auth/saml/user_spec.rb
index 862a5d9154457ee2fd5da8f42fb489dbd37655ac..052dba883738cb376c644d524223fea4ecab620b 100644
--- a/ee/spec/lib/gitlab/auth/saml/user_spec.rb
+++ b/ee/spec/lib/gitlab/auth/saml/user_spec.rb
@@ -6,7 +6,8 @@
   include LdapHelpers
   include LoginHelpers
 
-  let(:saml_user) { described_class.new(auth_hash) }
+  let(:organization) { create(:organization) }
+  let(:saml_user) { described_class.new(auth_hash, organization_id: organization.id) }
   let(:gl_user) { saml_user.gl_user }
   let(:uid) { 'my-uid' }
   let(:dn) { 'uid=user1,ou=people,dc=example' }
diff --git a/ee/spec/requests/ee/omniauth_callbacks_controller_spec.rb b/ee/spec/requests/ee/omniauth_callbacks_controller_spec.rb
index bb639a6d09694df17aa892cd5190778a98702652..1afb1f64ddb68deed2ad797a070fed96edfb5a32 100644
--- a/ee/spec/requests/ee/omniauth_callbacks_controller_spec.rb
+++ b/ee/spec/requests/ee/omniauth_callbacks_controller_spec.rb
@@ -19,7 +19,7 @@
       with_omniauth_full_host { example.run }
     end
 
-    context 'when user is not registered yet', :clean_gitlab_redis_sessions do
+    context 'when user is not registered yet', :with_current_organization, :clean_gitlab_redis_sessions do
       let(:user) { build_stubbed(:user, email: 'new@example.com') }
       let(:path) { '/user/return/to/path' }
 
diff --git a/lib/gitlab/auth/o_auth/user.rb b/lib/gitlab/auth/o_auth/user.rb
index ee0663ef0f8f194dfd102d507368c8e35bf9ee95..3a85ffe22c0e3c4d94bb02f294db066e289491a7 100644
--- a/lib/gitlab/auth/o_auth/user.rb
+++ b/lib/gitlab/auth/o_auth/user.rb
@@ -29,8 +29,9 @@ def find_by_uid_and_provider(uid, provider)
 
         attr_reader :auth_hash
 
-        def initialize(auth_hash)
+        def initialize(auth_hash, user_params = {})
           self.auth_hash = auth_hash
+          @user_params = user_params
           update_profile
           add_or_update_user_identities
         end
@@ -57,9 +58,7 @@ def save(provider = protocol_name)
 
           block_after_save = needs_blocking?
 
-          Namespace.with_disabled_organization_validation do
-            Users::UpdateService.new(gl_user, user: gl_user).execute!
-          end
+          Users::UpdateService.new(gl_user, user: gl_user).execute!
 
           gl_user.block_pending_approval if block_after_save
           activate_user_if_user_cap_not_reached
@@ -247,7 +246,8 @@ def user_attributes
             email: email,
             password: auth_hash.password,
             password_confirmation: auth_hash.password,
-            password_automatically_set: true
+            password_automatically_set: true,
+            organization_id: @user_params[:organization_id]
           }
         end
 
diff --git a/spec/controllers/omniauth_callbacks_controller_spec.rb b/spec/controllers/omniauth_callbacks_controller_spec.rb
index 07bb8df3cb2543e8af44178db3f869478c08bfc1..e0f5a112ea5d8b223e055f0c72068b8a6e8eff14 100644
--- a/spec/controllers/omniauth_callbacks_controller_spec.rb
+++ b/spec/controllers/omniauth_callbacks_controller_spec.rb
@@ -92,7 +92,7 @@
     end
   end
 
-  describe 'omniauth' do
+  describe 'omniauth', :with_current_organization do
     let(:user) { create(:omniauth_user, extern_uid: extern_uid, provider: provider) }
     let(:omniauth_email) { user.email }
     let(:additional_info) { {} }
@@ -648,7 +648,7 @@ def stub_last_request_id(id)
       let(:post_action) { post :saml, params: { SAMLResponse: mock_saml_response } }
     end
 
-    context 'for sign up' do
+    context 'for sign up', :with_current_organization do
       before do
         user.destroy!
       end
diff --git a/spec/features/registrations/oauth_registration_spec.rb b/spec/features/registrations/oauth_registration_spec.rb
index e9baf7bc393917ae3a56cc2b6c1db9e474cf46a4..50afb3076279c8adcd18addb21f85cccca10206c 100644
--- a/spec/features/registrations/oauth_registration_spec.rb
+++ b/spec/features/registrations/oauth_registration_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'OAuth Registration', :js, :allow_forgery_protection, feature_category: :system_access do
+RSpec.describe 'OAuth Registration', :js, :allow_forgery_protection, :with_current_organization, feature_category: :system_access do
   include LoginHelpers
   include TermsHelper
   using RSpec::Parameterized::TableSyntax
diff --git a/spec/lib/gitlab/auth/atlassian/user_spec.rb b/spec/lib/gitlab/auth/atlassian/user_spec.rb
index 1db01102bc2c63bfbe5e65393371f0c6e5735ff4..f2165a0281911a71a76fb06854f1f2e86462a365 100644
--- a/spec/lib/gitlab/auth/atlassian/user_spec.rb
+++ b/spec/lib/gitlab/auth/atlassian/user_spec.rb
@@ -3,7 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::Auth::Atlassian::User do
-  let(:oauth_user) { described_class.new(oauth) }
+  let_it_be(:organization) { create(:organization) }
+  let(:oauth_user) { described_class.new(oauth, organization_id: organization.id) }
   let(:gl_user) { oauth_user.gl_user }
   let(:extern_uid) { generate(:username) }
   let(:oauth) do
diff --git a/spec/lib/gitlab/auth/ldap/user_spec.rb b/spec/lib/gitlab/auth/ldap/user_spec.rb
index d635cfe0907646c48fe491dfd02d75e0acb4b21c..1f0b3d4d4b474a11f33970b2275b378c3081fe30 100644
--- a/spec/lib/gitlab/auth/ldap/user_spec.rb
+++ b/spec/lib/gitlab/auth/ldap/user_spec.rb
@@ -5,7 +5,8 @@
 RSpec.describe Gitlab::Auth::Ldap::User do
   include LdapHelpers
 
-  let(:ldap_user) { described_class.new(auth_hash) }
+  let_it_be(:organization) { create(:organization) }
+  let(:ldap_user) { described_class.new(auth_hash, organization_id: organization.id) }
   let(:gl_user) { ldap_user.gl_user }
   let(:info) do
     {
diff --git a/spec/lib/gitlab/auth/o_auth/user_spec.rb b/spec/lib/gitlab/auth/o_auth/user_spec.rb
index d56ea66b951fe07f7c7cd0fd2933d719031a67e5..580a11fe1d377867bf505f999c149a9daf6e41fa 100644
--- a/spec/lib/gitlab/auth/o_auth/user_spec.rb
+++ b/spec/lib/gitlab/auth/o_auth/user_spec.rb
@@ -5,8 +5,9 @@
 RSpec.describe Gitlab::Auth::OAuth::User, feature_category: :system_access do
   include LdapHelpers
 
-  let(:oauth_user) { described_class.new(auth_hash) }
-  let(:oauth_user_2) { described_class.new(auth_hash_2) }
+  let_it_be(:organization) { create(:organization) }
+  let(:oauth_user) { described_class.new(auth_hash, organization_id: organization.id) }
+  let(:oauth_user_2) { described_class.new(auth_hash_2, organization_id: organization.id) }
   let(:gl_user) { oauth_user.gl_user }
   let(:gl_user_2) { oauth_user_2.gl_user }
   let(:uid) { 'my-uid' }
@@ -83,7 +84,7 @@
           nickname: 'jastrom'
         }
         special_hash = OmniAuth::AuthHash.new(uid: dn, provider: 'ldapmain', info: special_info)
-        special_chars_user = described_class.new(special_hash)
+        special_chars_user = described_class.new(special_hash, organization_id: organization.id)
         user = special_chars_user.save
 
         expect(described_class.find_by_uid_and_provider(dn, 'ldapmain')).to eq user
diff --git a/spec/lib/gitlab/auth/saml/user_spec.rb b/spec/lib/gitlab/auth/saml/user_spec.rb
index 599d55cdb832eb252c173a18d668fa4e56977b2e..f96c7fe0bc438a81b6e8dc5199c2b0ba411e63c5 100644
--- a/spec/lib/gitlab/auth/saml/user_spec.rb
+++ b/spec/lib/gitlab/auth/saml/user_spec.rb
@@ -6,7 +6,8 @@
   include LdapHelpers
   include LoginHelpers
 
-  let(:saml_user) { described_class.new(auth_hash) }
+  let_it_be(:organization) { create(:organization) }
+  let(:saml_user) { described_class.new(auth_hash, organization_id: organization.id) }
   let(:gl_user) { saml_user.gl_user }
   let(:uid) { 'my-uid' }
   let(:dn) { 'uid=user1,ou=people,dc=example' }
diff --git a/spec/support/helpers/disable_namespace_organization_validation.yml b/spec/support/helpers/disable_namespace_organization_validation.yml
index 2e93c724fce16793d6854467c0f3d12ab86ca533..5073522243d3cbcdebf5443fe905ae847158a396 100644
--- a/spec/support/helpers/disable_namespace_organization_validation.yml
+++ b/spec/support/helpers/disable_namespace_organization_validation.yml
@@ -20,8 +20,6 @@
 - ee/spec/features/registrations/start_trial_from_external_site_without_confirmation_spec.rb
 - ee/spec/features/trials/saas/creation_with_no_existing_namespace_flow_spec.rb
 - ee/spec/lib/gitlab/auth/group_saml/user_spec.rb
-- ee/spec/lib/gitlab/auth/ldap/user_spec.rb
-- ee/spec/lib/gitlab/auth/oidc/user_spec.rb
 - ee/spec/lib/gitlab/auth/saml/user_spec.rb
 - ee/spec/lib/ee/gitlab/scim/provisioning_service_spec.rb
 - ee/spec/lib/ee/gitlab/scim/group/provisioning_service_spec.rb
@@ -33,7 +31,6 @@
 - spec/controllers/admin/groups_controller_spec.rb
 - spec/controllers/admin/users_controller_spec.rb
 - spec/controllers/groups_controller_spec.rb
-- spec/controllers/omniauth_callbacks_controller_spec.rb
 - spec/controllers/registrations_controller_spec.rb
 - spec/features/admin/admin_groups_spec.rb
 - spec/features/dashboard/group_spec.rb
@@ -42,7 +39,6 @@
 - spec/graphql/types/project_type_spec.rb
 - spec/lib/gitlab/auth/atlassian/user_spec.rb
 - spec/lib/gitlab/auth/ldap/user_spec.rb
-- spec/lib/gitlab/auth/o_auth/user_spec.rb
 - spec/lib/gitlab/auth/saml/user_spec.rb
 - spec/models/hooks/system_hook_spec.rb
 - spec/requests/api/groups_spec.rb