Changed to using Username instead of Email