Update to check email instead of username