SIO-1531 strange characters still allowed in logins (eg. @kruk)

Change-Id: I1671012ba1782f5048f10d63e45ad04f6f150f58
Merge "SIO-1531 strange characters still allowed in logins (eg. @kruk)"