Allow user names to be email addresses

It is very common across enterprises to use email addresses as userid.
Removing the split when there is an @ in the user name allows for this