handle user@corp.net username correctly
Merge pull request #2040 from dpoe/stable-1.1

handle user@corp.net username correctly