Updated to support a number in username, ie. swebster1