Fix bug; support either username or email