From 47e7e51064edd7e011332634f81a558cff4595f2 Mon Sep 17 00:00:00 2001
From: Shreyas Ikhar <shreyasikhar26@gmail.com>
Date: Tue, 28 Apr 2026 18:06:45 +0530
Subject: [PATCH 1/2] Fix error messages for invalid usernames to use
 consistent terminology

---
 src/wp-admin/includes/user.php                                  | 2 +-
 .../rest-api/endpoints/class-wp-rest-users-controller.php       | 2 +-
 src/wp-includes/user.php                                        | 2 +-
 tests/phpunit/tests/rest-api/rest-users-controller.php          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wp-admin/includes/user.php b/src/wp-admin/includes/user.php
index 477ee9b5af4b7..9e2abc107157c 100644
--- a/src/wp-admin/includes/user.php
+++ b/src/wp-admin/includes/user.php
@@ -188,7 +188,7 @@ function edit_user( $user_id = 0 ) {
 	}
 
 	if ( ! $update && isset( $_POST['user_login'] ) && ! validate_username( $_POST['user_login'] ) ) {
-		$errors->add( 'user_login', __( '<strong>Error:</strong> This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
+		$errors->add( 'user_login', __( '<strong>Error:</strong> This username is invalid because it uses unallowed characters. Please enter a valid username.' ) );
 	}
 
 	if ( ! $update && username_exists( $user->user_login ) ) {
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
index 9b25cf7974cbc..f8ffa084ef015 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
@@ -1322,7 +1322,7 @@ public function check_username( $value, $request, $param ) {
 		if ( ! validate_username( $username ) ) {
 			return new WP_Error(
 				'rest_user_invalid_username',
-				__( 'This username is invalid because it uses illegal characters. Please enter a valid username.' ),
+				__( 'This username is invalid because it uses unallowed characters. Please enter a valid username.' ),
 				array( 'status' => 400 )
 			);
 		}
diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php
index 9c635f63d288a..ccf173f464f0d 100644
--- a/src/wp-includes/user.php
+++ b/src/wp-includes/user.php
@@ -3544,7 +3544,7 @@ function register_new_user( $user_login, $user_email ) {
 	if ( '' === $sanitized_user_login ) {
 		$errors->add( 'empty_username', __( '<strong>Error:</strong> Please enter a username.' ) );
 	} elseif ( ! validate_username( $user_login ) ) {
-		$errors->add( 'invalid_username', __( '<strong>Error:</strong> This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
+		$errors->add( 'invalid_username', __( '<strong>Error:</strong> This username is invalid because it uses unallowed characters. Please enter a valid username.' ) );
 		$sanitized_user_login = '';
 	} elseif ( username_exists( $sanitized_user_login ) ) {
 		$errors->add( 'username_exists', __( '<strong>Error:</strong> This username is already registered. Please choose another one.' ) );
diff --git a/tests/phpunit/tests/rest-api/rest-users-controller.php b/tests/phpunit/tests/rest-api/rest-users-controller.php
index b78e95b95f48d..f97bf54a92fc4 100644
--- a/tests/phpunit/tests/rest-api/rest-users-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-users-controller.php
@@ -1416,7 +1416,7 @@ public function test_create_item_invalid_username() {
 			$this->assertIsArray( $data['data']['params'] );
 			$errors = $data['data']['params'];
 			$this->assertIsString( $errors['username'] );
-			$this->assertSame( 'This username is invalid because it uses illegal characters. Please enter a valid username.', $errors['username'] );
+			$this->assertSame( 'This username is invalid because it uses unallowed characters. Please enter a valid username.', $errors['username'] );
 		}
 	}
 

From 3203b6c1d31262d90228ef598ba82f041d6ff549 Mon Sep 17 00:00:00 2001
From: Shreyas Ikhar <shreyasikhar26@gmail.com>
Date: Thu, 30 Apr 2026 17:24:59 +0530
Subject: [PATCH 2/2] Fix terminology in username validation error messages to
 use "disallowed" instead of "unallowed"

---
 src/wp-admin/includes/user.php                                  | 2 +-
 .../rest-api/endpoints/class-wp-rest-users-controller.php       | 2 +-
 src/wp-includes/user.php                                        | 2 +-
 tests/phpunit/tests/rest-api/rest-users-controller.php          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wp-admin/includes/user.php b/src/wp-admin/includes/user.php
index 9e2abc107157c..1a4097d58c9a8 100644
--- a/src/wp-admin/includes/user.php
+++ b/src/wp-admin/includes/user.php
@@ -188,7 +188,7 @@ function edit_user( $user_id = 0 ) {
 	}
 
 	if ( ! $update && isset( $_POST['user_login'] ) && ! validate_username( $_POST['user_login'] ) ) {
-		$errors->add( 'user_login', __( '<strong>Error:</strong> This username is invalid because it uses unallowed characters. Please enter a valid username.' ) );
+		$errors->add( 'user_login', __( '<strong>Error:</strong> This username is invalid because it uses disallowed characters. Please enter a valid username.' ) );
 	}
 
 	if ( ! $update && username_exists( $user->user_login ) ) {
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
index f8ffa084ef015..ae9ccff0a5630 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
@@ -1322,7 +1322,7 @@ public function check_username( $value, $request, $param ) {
 		if ( ! validate_username( $username ) ) {
 			return new WP_Error(
 				'rest_user_invalid_username',
-				__( 'This username is invalid because it uses unallowed characters. Please enter a valid username.' ),
+				__( 'This username is invalid because it uses disallowed characters. Please enter a valid username.' ),
 				array( 'status' => 400 )
 			);
 		}
diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php
index ccf173f464f0d..35d95e0c1b82c 100644
--- a/src/wp-includes/user.php
+++ b/src/wp-includes/user.php
@@ -3544,7 +3544,7 @@ function register_new_user( $user_login, $user_email ) {
 	if ( '' === $sanitized_user_login ) {
 		$errors->add( 'empty_username', __( '<strong>Error:</strong> Please enter a username.' ) );
 	} elseif ( ! validate_username( $user_login ) ) {
-		$errors->add( 'invalid_username', __( '<strong>Error:</strong> This username is invalid because it uses unallowed characters. Please enter a valid username.' ) );
+		$errors->add( 'invalid_username', __( '<strong>Error:</strong> This username is invalid because it uses disallowed characters. Please enter a valid username.' ) );
 		$sanitized_user_login = '';
 	} elseif ( username_exists( $sanitized_user_login ) ) {
 		$errors->add( 'username_exists', __( '<strong>Error:</strong> This username is already registered. Please choose another one.' ) );
diff --git a/tests/phpunit/tests/rest-api/rest-users-controller.php b/tests/phpunit/tests/rest-api/rest-users-controller.php
index f97bf54a92fc4..ffb4d87d12353 100644
--- a/tests/phpunit/tests/rest-api/rest-users-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-users-controller.php
@@ -1416,7 +1416,7 @@ public function test_create_item_invalid_username() {
 			$this->assertIsArray( $data['data']['params'] );
 			$errors = $data['data']['params'];
 			$this->assertIsString( $errors['username'] );
-			$this->assertSame( 'This username is invalid because it uses unallowed characters. Please enter a valid username.', $errors['username'] );
+			$this->assertSame( 'This username is invalid because it uses disallowed characters. Please enter a valid username.', $errors['username'] );
 		}
 	}