diff --git a/core/templates/404.php b/core/templates/404.php
index 67ce8c8026..13a8101034 100644
--- a/core/templates/404.php
+++ b/core/templates/404.php
@@ -7,12 +7,9 @@ if(!isset($_)){//also provide standalone error page
 	exit;
 }
 ?>
-<div id="login">
-	<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>
+<ul>
+	<li class='error'>
+		<?php echo $l->t( 'Cloud not found' ); ?><br/>
+		<p class='hint'><?php if(isset($_['file'])) echo $_['file']?></p>
+	</li>
+</ul>
diff --git a/core/templates/error.php b/core/templates/error.php
index aa8a8d473b..4f05e008f9 100644
--- a/core/templates/error.php
+++ b/core/templates/error.php
@@ -1,12 +1,8 @@
-<div id="login">
-	<header><img src="<?php echo image_path('', 'owncloud-logo-medium-white.png'); ?>" alt="ownCloud" /></header>
-	<ul>
-		<?php foreach($_["errors"] as $error):?>
-			<li class='error'>
-				<?php echo $error['error'] ?><br/>
-				<p class='hint'><?php if(isset($error['hint']))echo $error['hint'] ?></p>
-			</li>
-		<?php endforeach ?>
-	</ul>
-</div>
-
+<ul>
+	<?php foreach($_["errors"] as $error):?>
+		<li class='error'>
+			<?php echo $error['error'] ?><br/>
+			<p class='hint'><?php if(isset($error['hint']))echo $error['hint'] ?></p>
+		</li>
+	<?php endforeach ?>
+</ul>