diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 946853c361..9b999e656b 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -6033,7 +6033,7 @@ function wp_guess_url() {
 
 		// The request is for the admin.
 		if ( strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) !== false || strpos( $_SERVER['REQUEST_URI'], 'wp-login.php' ) !== false ) {
-			$path = preg_replace( '#/(wp-admin/.*|wp-login.php)#i', '', $_SERVER['REQUEST_URI'] );
+			$path = preg_replace( '#/(wp-admin/?.*|wp-login\.php.*)#i', '', $_SERVER['REQUEST_URI'] );
 
 			// The request is for a file in ABSPATH.
 		} elseif ( $script_filename_dir . '/' === $abspath_fix ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f739632fa4..aeee000cdf 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.1-alpha-54145';
+$wp_version = '6.1-alpha-54146';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.