Fix more problems with not-safed usernames

They were causing endless problems

Change-Id: I362978672e428f56cb73b8279de893b0a6599f50