diff --git a/raddb/policy.d/cui b/raddb/policy.d/cui
index ea04a4dd9a5b..0dc34ec203fa 100644
--- a/raddb/policy.d/cui
+++ b/raddb/policy.d/cui
@@ -82,9 +82,9 @@ cui.post-auth {
 	#  accounting, comment out the 'cuisql' line below.
 	#
 	if (reply:Chargeable-User-Identity) {
-		# remove User-Name from the reply for security
-		update reply {
-			User-Name !* ANY
+		# Force User-Name to be the User-Name from the request
+		update {
+			reply:User-Name := &request:User-Name
 		}
 		cuisql
 	}