diff --git a/src/wp-admin/includes/ms-admin-filters.php b/src/wp-admin/includes/ms-admin-filters.php
index d3f3b7f5ec..fb4f678a3a 100644
--- a/src/wp-admin/includes/ms-admin-filters.php
+++ b/src/wp-admin/includes/ms-admin-filters.php
@@ -12,6 +12,7 @@ add_filter( 'wp_handle_upload_prefilter', 'check_upload_size' );
 
 // User Hooks
 add_action( 'admin_notices', 'new_user_email_admin_notice' );
+add_action( 'user_admin_notices', 'new_user_email_admin_notice' );
 
 add_action( 'admin_page_access_denied', '_access_denied_splash', 99 );
 
diff --git a/src/wp-admin/includes/ms.php b/src/wp-admin/includes/ms.php
index 4eef206ee8..e3ce2a36e1 100644
--- a/src/wp-admin/includes/ms.php
+++ b/src/wp-admin/includes/ms.php
@@ -403,10 +403,15 @@ All at ###SITENAME###
  * after email address change.
  *
  * @since 3.0.0
+ *
+ * @global string $pagenow
  */
 function new_user_email_admin_notice() {
-	if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) && isset( $_GET['updated'] ) && $email = get_option( get_current_user_id() . '_new_email' ) )
-		echo "<div class='update-nag'>" . sprintf( __( "Your email address has not been updated yet. Please check your inbox at %s for a confirmation email." ), $email['newemail'] ) . "</div>";
+	global $pagenow;
+	if ( 'profile.php' === $pagenow && isset( $_GET['updated'] ) && $email = get_option( get_current_user_id() . '_new_email' ) ) {
+		/* translators: %s: New email address */
+		echo '<div class="update-nag">' . sprintf( __( 'Your email address has not been updated yet. Please check your inbox at %s for a confirmation email.' ), esc_html( $email['newemail'] ) ) . '</div>';
+	}
 }
 
 /**