Replaced email validation with @ check and separated loginWithEmail and loginWithUsername - Fix #79