diff --git a/wp-settings.php b/wp-settings.php
index d99487dde7..af4daf4a54 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -61,8 +61,13 @@ require (ABSPATH . WPINC . '/functions.php');
 require_once (ABSPATH . WPINC . '/wp-l10n.php');
 
 $wpdb->hide_errors();
-if ( !update_user_cache() && !strstr($_SERVER['PHP_SELF'], 'install.php') )
-	die("It doesn't look like you've installed WP yet. Try running <a href='wp-admin/install.php'>install.php</a>.");
+if ( !update_user_cache() && !strstr($_SERVER['PHP_SELF'], 'install.php') ) {
+	if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') )
+		$link = 'install.php';
+	else
+		$link = 'wp-admin/install.php';
+	die("It doesn't look like you've installed WP yet. Try running <a href='$link'>install.php</a>.");
+}
 $wpdb->show_errors();
 
 require (ABSPATH . WPINC . '/functions-formatting.php');