Allow underscores for usernames. Fix #649