diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
index e5f814adea0bc265b35c77e343d91324bd25ce6a..4003f4437f0cceb59ee8ae46a31819e84403dfa6 100644
--- a/lib/SimpleSAML/Utilities.php
+++ b/lib/SimpleSAML/Utilities.php
@@ -1335,15 +1335,10 @@ class SimpleSAML_Utilities {
 
 
 	/**
-	 * Check whether the current user is a admin user.
-	 *
-	 * @return bool  TRUE if the current user is a admin user, FALSE if not.
+	 * @deprecated This function will be removed in SSP 2.0. Please use SimpleSAML_Utils_Auth::isAdmin() instead.
 	 */
 	public static function isAdmin() {
-
-		$session = SimpleSAML_Session::getSessionFromRequest();
-
-		return $session->isValid('admin') || $session->isValid('login-admin');
+		return SimpleSAML_Utils_Auth::isAdmin();
 	}
 
 
@@ -1372,7 +1367,7 @@ class SimpleSAML_Utilities {
 	 */
 	public static function requireAdmin() {
 
-		if (self::isAdmin()) {
+		if (SimpleSAML_Utils_Auth::isAdmin()) {
 			return;
 		}
 
diff --git a/lib/SimpleSAML/Utils/Auth.php b/lib/SimpleSAML/Utils/Auth.php
new file mode 100644
index 0000000000000000000000000000000000000000..439daa1339ff19f3e2d0909e073d21e5ff308259
--- /dev/null
+++ b/lib/SimpleSAML/Utils/Auth.php
@@ -0,0 +1,24 @@
+<?php
+
+
+/**
+ * Auth-related utility methods.
+ *
+ * @package SimpleSAMLphp
+ */
+class SimpleSAML_Utils_Auth
+{
+
+    /**
+     * Check whether the current user is admin.
+     *
+     * @return boolean True if the current user is an admin user, false otherwise.
+     *
+     * @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
+     */
+    public static function isAdmin()
+    {
+        $session = SimpleSAML_Session::getSessionFromRequest();
+        return $session->isValid('admin') || $session->isValid('login-admin');
+    }
+}
\ No newline at end of file
diff --git a/modules/core/www/frontpage_auth.php b/modules/core/www/frontpage_auth.php
index ef4fcaf20b5ec73890056741cb01275191d46758..2db5dc0b59f2aee20881b830edd4684ed0a4593d 100644
--- a/modules/core/www/frontpage_auth.php
+++ b/modules/core/www/frontpage_auth.php
@@ -10,7 +10,7 @@ if ($config->getBoolean('admin.protectindexpage', false)) {
 	SimpleSAML_Utilities::requireAdmin();
 }
 $loginurl = SimpleSAML_Utilities::getAdminLoginURL();
-$isadmin = SimpleSAML_Utilities::isAdmin();
+$isadmin = SimpleSAML_Utils_Auth::isAdmin();
 
 
 
diff --git a/modules/core/www/frontpage_config.php b/modules/core/www/frontpage_config.php
index 8fc6f377604eefb5961cf72fe6e775805465966d..eee1fa639b1c8f25660897595a320839617f0fce 100644
--- a/modules/core/www/frontpage_config.php
+++ b/modules/core/www/frontpage_config.php
@@ -11,7 +11,7 @@ if ($config->getBoolean('admin.protectindexpage', false)) {
 	SimpleSAML_Utilities::requireAdmin();
 }
 $loginurl = SimpleSAML_Utilities::getAdminLoginURL();
-$isadmin = SimpleSAML_Utilities::isAdmin();
+$isadmin = SimpleSAML_Utils_Auth::isAdmin();
 
 
 $warnings = array();
diff --git a/modules/core/www/frontpage_federation.php b/modules/core/www/frontpage_federation.php
index 512061ed47d701afdc7469c24813e53ecbf0d63e..02f6d9eaff9813a63727758fb313b8a8e41510de 100644
--- a/modules/core/www/frontpage_federation.php
+++ b/modules/core/www/frontpage_federation.php
@@ -11,7 +11,7 @@ if ($config->getBoolean('admin.protectindexpage', false)) {
 	SimpleSAML_Utilities::requireAdmin();
 }
 $loginurl = SimpleSAML_Utilities::getAdminLoginURL();
-$isadmin = SimpleSAML_Utilities::isAdmin();
+$isadmin = SimpleSAML_Utils_Auth::isAdmin();
 
 
 
diff --git a/modules/core/www/frontpage_welcome.php b/modules/core/www/frontpage_welcome.php
index 281237a9b121b2d135da8c7d2a162ee8e0ed33eb..1bea6471d10835a8b4ce8416687b9c2e1712050e 100644
--- a/modules/core/www/frontpage_welcome.php
+++ b/modules/core/www/frontpage_welcome.php
@@ -10,7 +10,7 @@ if ($config->getBoolean('admin.protectindexpage', false)) {
 	SimpleSAML_Utilities::requireAdmin();
 }
 $loginurl = SimpleSAML_Utilities::getAdminLoginURL();
-$isadmin = SimpleSAML_Utilities::isAdmin();
+$isadmin = SimpleSAML_Utils_Auth::isAdmin();
 
 
 
diff --git a/modules/statistics/lib/AccessCheck.php b/modules/statistics/lib/AccessCheck.php
index 92d1f906a5775c8fe2071d8edb125be781f4f399..e30f883ee1d7c71a63e58058ac5e31eaf5c4c2c8 100644
--- a/modules/statistics/lib/AccessCheck.php
+++ b/modules/statistics/lib/AccessCheck.php
@@ -28,7 +28,7 @@ class sspmod_statistics_AccessCheck {
 			return;
 		}
 
-		if (SimpleSAML_Utilities::isAdmin()) {
+		if (SimpleSAML_Utils_Auth::isAdmin()) {
 			// User logged in as admin. OK.
 			SimpleSAML_Logger::debug('Statistics auth - logged in as admin, access granted');
 			return;