Clean up change_username code a lot