diff --git a/python3/plugins/extauth-hook-AD.py b/python3/plugins/extauth-hook-AD.py
index d3e89aae8c8..d867cb9c7f9 100755
--- a/python3/plugins/extauth-hook-AD.py
+++ b/python3/plugins/extauth-hook-AD.py
@@ -332,7 +332,7 @@ def __init__(self, session, args, ad_enabled=True):
             "/etc/nsswitch.conf", session, args, ad_enabled)
         modules = "files sss"
         if ad_enabled:
-            modules = "files hcp winbind"
+            modules = "files override_id winbind"
         self._update_key_value("passwd", modules)
         self._update_key_value("group", modules)
         self._update_key_value("shadow", modules)
diff --git a/python3/plugins/test_extauth_hook_AD.py b/python3/tests/test_extauth_hook_AD.py
similarity index 99%
rename from python3/plugins/test_extauth_hook_AD.py
rename to python3/tests/test_extauth_hook_AD.py
index eb9d1107e87..11b24154ed7 100644
--- a/python3/plugins/test_extauth_hook_AD.py
+++ b/python3/tests/test_extauth_hook_AD.py
@@ -201,7 +201,7 @@ def test_ad_not_enabled(self, mock_install):
         self.assertTrue(line_exists_in_config(nss._lines, expected_config))
 
     def test_ad_enabled(self, mock_install):
-        expected_config = "passwd: files hcp winbind"
+        expected_config = "passwd: files override_id winbind"
         nss = NssConfig(mock_session, args_bd_winbind, True)
         nss.apply()
         self.assertTrue(line_exists_in_config(nss._lines, expected_config))