fix bug 753563 - Support username changes

@rubenvereecken - this looks the same as the test logic above? We should change logic here (or add another test) to verify the regex blocks a username with an `@` character.