Fixed the username bug