Changed the method of formating usernames to the proper one to address #37