diff --git a/modules/sanitycheck/hooks/hook_frontpage.php b/modules/sanitycheck/hooks/hook_frontpage.php
index 8245ae24bb16e1b8c72a811635b132844ceeb8ce..821761910fa698f208298353eed571f65de8a46f 100644
--- a/modules/sanitycheck/hooks/hook_frontpage.php
+++ b/modules/sanitycheck/hooks/hook_frontpage.php
@@ -8,9 +8,10 @@ function sanitycheck_hook_frontpage(&$links) {
 	assert('is_array($links)');
 	assert('array_key_exists("links", $links)');
 
-	$links['links'][] = array(
+	$links['links']['santitycheck'] = array(
 		'href' => SimpleSAML_Module::getModuleURL('sanitycheck/index.php'),
 		'text' => array('en' => 'Sanity check of your simpleSAMLphp setup'),
+		'shorttext' => array('en' => 'SanityCheck'),
 	);
 
 }
diff --git a/modules/sanitycheck/www/index.php b/modules/sanitycheck/www/index.php
index 3446187d45a97a75ccee42a31d07b6f431aec9cf..3f94e004002e144d7a77db985ecb8dadb11a15c3 100644
--- a/modules/sanitycheck/www/index.php
+++ b/modules/sanitycheck/www/index.php
@@ -23,8 +23,16 @@ if (isset($_REQUEST['output']) && $_REQUEST['output'] == 'text') {
 	exit;
 }
 
+$htmlContentPre = array(); $htmlContentPost = array(); $htmlContentHead = array(); $jquery = array();
+$hookinfo = array('pre' => &$htmlContentPre, 'post' => &$htmlContentPost, 'head' => &$htmlContentHead, 'jquery' => &$jquery, 'page' => 'santitycheck');
+SimpleSAML_Module::callHooks('htmlinject', $hookinfo);
+
 
 $t = new SimpleSAML_XHTML_Template($config, 'sanitycheck:check-tpl.php');
 $t->data['errors'] = $errors;
 $t->data['info'] = $info;
+$t->data['htmlContentPre'] = $htmlContentPre;
+$t->data['htmlContentPost'] = $htmlContentPost;
+$t->data['htmlContentHead'] = $htmlContentHead;
+$t->data['jquery'] = $jquery;
 $t->show();