Cleaning up how the username is retrieved.