Adding required email field, ability to login via email or username