Bug 1015639 - disallow usernames - without breaking usernames that alrea...

...dy have underscores