diff --git a/modules/core/hooks/hook_sanitycheck.php b/modules/core/hooks/hook_sanitycheck.php
new file mode 100644
index 0000000000000000000000000000000000000000..c2e8e6fb713b67fc210883f321a77367b34f3c45
--- /dev/null
+++ b/modules/core/hooks/hook_sanitycheck.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Hook to do sanitycheck
+ *
+ * @param array &$hookinfo  hookinfo
+ */
+function core_hook_sanitycheck(&$hookinfo) {
+	assert('is_array($hookinfo)');
+	assert('array_key_exists("errors", $hookinfo)');
+	assert('array_key_exists("info", $hookinfo)');
+
+	$config = SimpleSAML_Configuration::getInstance();
+	
+	if($config->getValue('auth.adminpassword', '123') === '123') {
+		$hookinfo['errors'][] = '[core] Password in config.php is not set properly';
+	} else {
+		$hookinfo['info'][] = '[core] Password in config.php is set properly';
+	}
+
+	if($config->getValue('technicalcontact_email', 'na@example.org') === 'na@example.org') {
+		$hookinfo['errors'][] = '[core] In config.php technicalcontact_email is not set properly';
+	} else {
+		$hookinfo['info'][] = '[core] In config.php technicalcontact_email is set properly';
+	}
+	
+	if (version_compare(phpversion(), '5.2', '>=')) {
+		$hookinfo['info'][] = '[core] You are running PHP version ' . phpversion() . '. Great.';
+	} elseif( version_compare(phpversion(), '5.1.2', '>=')) {
+		$hookinfo['info'][] = '[core] You are running PHP version ' . phpversion() . '. Its reccomended to upgrade to >= 5.2';
+	} else {
+		$hookinfo['errors'][] = '[core] You are running PHP version ' . phpversion() . '. SimpleSAMLphp requires version >= 5.1.2, and reccomends version >= 5.2. Please upgrade!';
+	}
+	
+}
+?>
\ No newline at end of file