Fixed so that location is automatically added to the end of a user name