Do not break on usernames that include an '@' char (Issue #63)