diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index 45792b5bd..d1303b12a 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -312,52 +312,22 @@ class wpdb {
 			return false;
 
 		header('Content-Type: text/html; charset=utf-8');
+
+		if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') )
+			$admin_dir = '';
+		else
+			$admin_dir = 'wp-admin/';
+
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<title>WordPress &rsaquo; Error</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<style media="screen" type="text/css">
-	<!--
-	html {
-		background: #eee;
-	}
-	body {
-		background: #fff;
-		color: #000;
-		font-family: Georgia, "Times New Roman", Times, serif;
-		margin-left: 25%;
-		margin-right: 25%;
-		padding: .2em 2em;
-	}
-
-	h1 {
-		color: #006;
-		font-size: 18px;
-		font-weight: lighter;
-	}
-
-	h2 {
-		font-size: 16px;
-	}
-
-	p, li, dt {
-		line-height: 140%;
-		padding-bottom: 2px;
-	}
-
-	ul, ol {
-		padding: 5px 5px 5px 20px;
-	}
-	#logo {
-		margin-bottom: 2em;
-	}
-	-->
-	</style>
+	<link rel="stylesheet" href="<?php echo $admin_dir; ?>install.css" type="text/css" />
 </head>
 <body>
-	<h1 id="logo"><img alt="WordPress" src="<?php echo 'wp-admin/images/wordpress-logo.png' ?>" /></h1>
+	<h1 id="logo"><img alt="WordPress" src="<?php echo $admin_dir; ?>images/wordpress-logo.png" /></h1>
 	<p><?php echo $message; ?></p>
 </body>
 </html>
