diff --git a/core/css/styles.css b/core/css/styles.css
index 05546541153..eb6b04d28df 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -32,7 +32,7 @@ div.controls { width:100%; margin:0px; background-color:#f7f7f7; border-bottom:1
 #body-login p.info { width:16em; margin:2em auto; padding:1em; background-color:#eee; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; }
 #body-login p.info a { font-weight:bold; }
 
-#login div.header { margin-top:-2em; height:10em;
+#body-login header { margin-top:-2em; height:10em;
  -moz-box-shadow:0 0 5px #000; -webkit-box-shadow:0 0 20px #000; box-shadow:0 0 20px #000;
 background: #1d2d44; /* Old browsers */
 background: -moz-linear-gradient(top, #35537a 0%, #1d2d42 100%); /* FF3.6+ */
diff --git a/core/templates/404.php b/core/templates/404.php
index d042944c193..67ce8c8026c 100644
--- a/core/templates/404.php
+++ b/core/templates/404.php
@@ -8,11 +8,11 @@ if(!isset($_)){//also provide standalone error page
 }
 ?>
 <div id="login">
-	<img src="<?php echo image_path("", "weather-clear.png"); ?>" alt="ownCloud" />
+	<header><img src="<?php echo image_path('', 'weather-clear.png'); ?>" alt="ownCloud" /></header>
 	<ul>
 		<li class='error'>
 			<?php echo $l->t( 'Error 404, Cloud not found' ); ?><br/>
 			<p class='hint'><?php if(isset($_['file'])) echo $_['file']?></p>
 		</li>
 	</ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/core/templates/error.php b/core/templates/error.php
index ae3f029708f..aa8a8d473b4 100644
--- a/core/templates/error.php
+++ b/core/templates/error.php
@@ -1,10 +1,5 @@
-<?php
-/*
- * Template for error page
- */
-?>
 <div id="login">
-	<img src="<?php echo image_path("", "owncloud-logo-medium-white.png"); ?>" alt="ownCloud" />
+	<header><img src="<?php echo image_path('', 'owncloud-logo-medium-white.png'); ?>" alt="ownCloud" /></header>
 	<ul>
 		<?php foreach($_["errors"] as $error):?>
 			<li class='error'>