Add option to use email address for username