Fix typo and allow logins with @