diff --git a/templates/default/includes/footer.php b/templates/default/includes/footer.php
index 16cff779743ecef8c5b493706dac1cc40e3f5df1..0672a8c6a63a729816e1af0f6c2ce34a7d5ef3bf 100644
--- a/templates/default/includes/footer.php
+++ b/templates/default/includes/footer.php
@@ -3,7 +3,7 @@
 
 		<hr />
 
-		<img src="resources/icons/ssplogo-fish-small.png" style="float: right" />		
+		<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/ssplogo-fish-small.png" alt="Small fish logo" style="float: right" />		
 		Copyright &copy; 2007-2008 <a href="http://rnd.feide.no/">Feide RnD</a>
 		
 		<br style="clear: right" />
diff --git a/templates/default/includes/header.php b/templates/default/includes/header.php
index 1c7cdf4fb95b70d1e0099ab3338fe3e722fd49b7..3cd9327d80a606b6e35bd157b952af2cf1b33a04 100644
--- a/templates/default/includes/header.php
+++ b/templates/default/includes/header.php
@@ -12,7 +12,6 @@ if(array_key_exists('header', $this->data)) {
 
 	<link rel="stylesheet" type="text/css" href="/<?php echo $this->data['baseurlpath']; ?>resources/default.css" />
 	<link rel="icon" type="image/icon" href="/<?php echo $this->data['baseurlpath']; ?>resources/icons/favicon.ico" />
-	<script type="text/javascript" src="/<?php echo $this->data['baseurlpath']; ?>resources/script.js"></script>
 	<meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
 
 <?php	
@@ -26,6 +25,10 @@ $onLoad = '';
 if(array_key_exists('autofocus', $this->data)) {
 	$onLoad .= 'SimpleSAML_focus(\'' . $this->data['autofocus'] . '\');';
 }
+if (isset($this->data['onLoad'])) {
+	$onLoad .= $this->data['onLoad']; 
+}
+
 if($onLoad !== '') {
 	$onLoad = ' onload="' . $onLoad . '"';
 }