diff --git a/dspace-api/src/main/java/org/dspace/authenticate/AuthenticationManager.java b/dspace-api/src/main/java/org/dspace/authenticate/AuthenticationManager.java
index e2b2ec87d7..47372e7cfb 100755
--- a/dspace-api/src/main/java/org/dspace/authenticate/AuthenticationManager.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/AuthenticationManager.java
@@ -49,7 +49,7 @@ public class AuthenticationManager
 {
     /** List of authentication methods, highest precedence first. */
     private static AuthenticationMethod methodStack[] =
-        (AuthenticationMethod[])PluginManager.getPluginSequence(AuthenticationMethod.class);
+        (AuthenticationMethod[])PluginManager.getPluginSequence("authentication", AuthenticationMethod.class);
 
     /**
      * Test credentials for authenticity.
diff --git a/dspace-api/src/test/resources/dspaceFolder/config/modules/authentication.cfg b/dspace-api/src/test/resources/dspaceFolder/config/modules/authentication.cfg
new file mode 100644
index 0000000000..160da2042f
--- /dev/null
+++ b/dspace-api/src/test/resources/dspaceFolder/config/modules/authentication.cfg
@@ -0,0 +1,10 @@
+# Stack of authentication methods
+#  (See org.dspace.authenticate.AuthenticationManager)
+#
+# Example:
+# plugin.sequence.org.dspace.authenticate.AuthenticationMethod = \
+#         org.dspace.authenticate.ShibAuthentication, \
+#         org.dspace.authenticate.PasswordAuthentication
+
+plugin.sequence.org.dspace.authenticate.AuthenticationMethod = \
+        org.dspace.authenticate.PasswordAuthentication
\ No newline at end of file
diff --git a/dspace/config/dspace.cfg b/dspace/config/dspace.cfg
index 07440384b4..24db9cf3b7 100644
--- a/dspace/config/dspace.cfg
+++ b/dspace/config/dspace.cfg
@@ -366,15 +366,6 @@ handle.dir = ${dspace.dir}/handle-server
 
 #### Stackable Authentication Methods #####
 
-# Stack of authentication methods
-#  (See org.dspace.authenticate.AuthenticationManager)
-# Example:
-# plugin.sequence.org.dspace.authenticate.AuthenticationMethod = \
-#       org.dspace.authenticate.ShibAuthentication, \
-#        org.dspace.authenticate.PasswordAuthentication
-plugin.sequence.org.dspace.authenticate.AuthenticationMethod = \
-        org.dspace.authenticate.PasswordAuthentication
-
 #### Shibboleth Authentication Configuration Settings ####
 # Check https://mams.melcoe.mq.edu.au/zope/mams/pubs/Installation/dspace15/view
 # for installation detail.
diff --git a/dspace/config/modules/authentication.cfg b/dspace/config/modules/authentication.cfg
new file mode 100644
index 0000000000..160da2042f
--- /dev/null
+++ b/dspace/config/modules/authentication.cfg
@@ -0,0 +1,10 @@
+# Stack of authentication methods
+#  (See org.dspace.authenticate.AuthenticationManager)
+#
+# Example:
+# plugin.sequence.org.dspace.authenticate.AuthenticationMethod = \
+#         org.dspace.authenticate.ShibAuthentication, \
+#         org.dspace.authenticate.PasswordAuthentication
+
+plugin.sequence.org.dspace.authenticate.AuthenticationMethod = \
+        org.dspace.authenticate.PasswordAuthentication
\ No newline at end of file