some adjustments for the username relocation...
Merge pull request #2305 from awesomerobot/master

some adjustments for the username relocation...