Fixing yet another auto generated user name