diff --git a/modules/statistics/config-templates/module_statistics.php b/modules/statistics/config-templates/module_statistics.php
index e684ccd1ab373a033a355d2b2a76f3737aa65d00..66f452d7c30c297c2e72fbfa0bbb39fff8df7eec 100644
--- a/modules/statistics/config-templates/module_statistics.php
+++ b/modules/statistics/config-templates/module_statistics.php
@@ -5,14 +5,15 @@
 
 $config = array (
 
-	// Access control on statistics page.
 	'protected' => FALSE,
+	'auth' => 'admin',
+	'useridattr' => 'eduPersonPrincipalName',
 	
-	/*
-	 * Which authenticatino source should be used for authentication exception from admin module.
-	 * Set to NULL if only using admin auth.
-	 */
-	//'auth' => 'feide',
+	'default' => 'sso_hoursweek',
+	
+	'allowedUsers' => array(
+		'admin'
+	),
 	
 	'default' => 'sso_hoursweek',
 	
diff --git a/modules/statistics/lib/Statistics/FieldPresentation/Entity.php b/modules/statistics/lib/Statistics/FieldPresentation/Entity.php
index 27b13b9893efe75a23f6a36a26a66bde3009b5dd..6d1bf9d6878038ce3866adc7048532be1bcedf0e 100644
--- a/modules/statistics/lib/Statistics/FieldPresentation/Entity.php
+++ b/modules/statistics/lib/Statistics/FieldPresentation/Entity.php
@@ -9,8 +9,11 @@ class sspmod_statistics_Statistics_FieldPresentation_Entity extends sspmod_stati
 		
 		$translation = array('_' => 'All services');
 		foreach($this->fields AS $field) {
-			if (array_key_exists($field, $metadata))
-				$translation[$field] = $this->template->t($metadata[$field]['name'], array(), FALSE);
+			if (array_key_exists($field, $metadata)) {
+				if (array_key_exists('name', $metadata[$field])) {
+					$translation[$field] = $this->template->t($metadata[$field]['name'], array(), FALSE);
+				}
+			}
 		}
 		return $translation;
 	}