Unicode user names to PROD

Hotfix version of PR #2398