[Bugfix] #7837, #7838 typing the email with an underscore gave error

[Bugfix] #7837, #7838 typing the email with an underscore gave error #8512