diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
index 0a455ac87a90b5638bf43a110e8fe19f761278a8..7a76d70e91cebc52aeba7e3869366cd16690386e 100644
--- a/lib/SimpleSAML/Utilities.php
+++ b/lib/SimpleSAML/Utilities.php
@@ -1343,19 +1343,10 @@ class SimpleSAML_Utilities {
 
 
 	/**
-	 * Retrieve a admin login URL.
-	 *
-	 * @param string|NULL $returnTo  The URL the user should arrive on after admin authentication.
-	 * @return string  A URL which can be used for admin authentication.
+	 * @deprecated This function will be removed in SSP 2.0. Please use SimpleSAML_Utils_Auth::getAdminLoginURL instead();
 	 */
 	public static function getAdminLoginURL($returnTo = NULL) {
-		assert('is_string($returnTo) || is_null($returnTo)');
-
-		if ($returnTo === NULL) {
-			$returnTo = SimpleSAML_Utilities::selfURL();
-		}
-
-		return SimpleSAML_Module::getModuleURL('core/login-admin.php', array('ReturnTo' => $returnTo));
+		return SimpleSAML_Utils_Auth::getAdminLoginURL($returnTo);
 	}
 
 
diff --git a/lib/SimpleSAML/Utils/Auth.php b/lib/SimpleSAML/Utils/Auth.php
index d9575c018b1195e7335756bdd22ac4967a2d1cc9..e8d29999310d6d87c9bfbff6206ec4cad6c0c42d 100644
--- a/lib/SimpleSAML/Utils/Auth.php
+++ b/lib/SimpleSAML/Utils/Auth.php
@@ -9,6 +9,24 @@
 class SimpleSAML_Utils_Auth
 {
 
+    /**
+     * Retrieve a admin login URL.
+     *
+     * @param string|NULL $returnTo The URL the user should arrive on after admin authentication. Defaults to null.
+     *
+     * @return string A URL which can be used for admin authentication.
+     */
+    public static function getAdminLoginURL($returnTo = null)
+    {
+        assert('is_string($returnTo) || is_null($returnTo)');
+
+        if ($returnTo === null) {
+            $returnTo = SimpleSAML_Utilities::selfURL();
+        }
+
+        return SimpleSAML_Module::getModuleURL('core/login-admin.php', array('ReturnTo' => $returnTo));
+    }
+
     /**
      * Check whether the current user is admin.
      *
diff --git a/modules/core/www/frontpage_auth.php b/modules/core/www/frontpage_auth.php
index 324867ef70925a9758f262dc89d6d7edc9482ebd..a471be7840bf6a6918d9c7912d5b737a32114e0f 100644
--- a/modules/core/www/frontpage_auth.php
+++ b/modules/core/www/frontpage_auth.php
@@ -9,7 +9,7 @@ $session = SimpleSAML_Session::getSessionFromRequest();
 if ($config->getBoolean('admin.protectindexpage', false)) {
     SimpleSAML_Utils_Auth::requireAdmin();
 }
-$loginurl = SimpleSAML_Utilities::getAdminLoginURL();
+$loginurl = SimpleSAML_Utils_Auth::getAdminLoginURL();
 $isadmin = SimpleSAML_Utils_Auth::isAdmin();
 
 
diff --git a/modules/core/www/frontpage_config.php b/modules/core/www/frontpage_config.php
index ee9dbc1d4017fea9cd2e4afec170ac1dc63ea595..4ec7585af1a3a2ebd41f00d6d22fc5281a6b1f8f 100644
--- a/modules/core/www/frontpage_config.php
+++ b/modules/core/www/frontpage_config.php
@@ -10,7 +10,7 @@ $session = SimpleSAML_Session::getSessionFromRequest();
 if ($config->getBoolean('admin.protectindexpage', false)) {
     SimpleSAML_Utils_Auth::requireAdmin();
 }
-$loginurl = SimpleSAML_Utilities::getAdminLoginURL();
+$loginurl = SimpleSAML_Utils_Auth::getAdminLoginURL();
 $isadmin = SimpleSAML_Utils_Auth::isAdmin();
 
 
diff --git a/modules/core/www/frontpage_federation.php b/modules/core/www/frontpage_federation.php
index e640f218892b3b70f8008212fc57785ece192c0d..34d610a31d1d951737def9f1ceb03158cbc05aed 100644
--- a/modules/core/www/frontpage_federation.php
+++ b/modules/core/www/frontpage_federation.php
@@ -10,7 +10,7 @@ $session = SimpleSAML_Session::getSessionFromRequest();
 if ($config->getBoolean('admin.protectindexpage', false)) {
     SimpleSAML_Utils_Auth::requireAdmin();
 }
-$loginurl = SimpleSAML_Utilities::getAdminLoginURL();
+$loginurl = SimpleSAML_Utils_Auth::getAdminLoginURL();
 $isadmin = SimpleSAML_Utils_Auth::isAdmin();
 
 
diff --git a/modules/core/www/frontpage_welcome.php b/modules/core/www/frontpage_welcome.php
index 95818c467238d4c061e9b4a5f5e432fe097f13f6..ca39d038cd56031f3d3cdef320d76477a1cfb09d 100644
--- a/modules/core/www/frontpage_welcome.php
+++ b/modules/core/www/frontpage_welcome.php
@@ -9,7 +9,7 @@ $session = SimpleSAML_Session::getSessionFromRequest();
 if ($config->getBoolean('admin.protectindexpage', false)) {
     SimpleSAML_Utils_Auth::requireAdmin();
 }
-$loginurl = SimpleSAML_Utilities::getAdminLoginURL();
+$loginurl = SimpleSAML_Utils_Auth::getAdminLoginURL();
 $isadmin = SimpleSAML_Utils_Auth::isAdmin();