diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index bca9e01e1..0c09d42f0 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -92,6 +92,13 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 			}
 		}
 
+		if ( ! $redirect_url && get_option( 'home' ) != get_option( 'url' ) ) {
+			if ( $original['path'] == home_url( 'wp-admin/', 'relative' ) )
+				$redirect_url = admin_url();
+			elseif ( $original['path'] == home_url( 'wp-login.php', 'relative' ) )
+				$redirect_url = site_url( 'wp-login.php', 'login' );
+		}
+
 		if ( ! $redirect_url )
 			$redirect_url = redirect_guess_404_permalink( $requested_url );