Refactoring username to something reasonable