DNN-6093 Improvements to "Use Email Address as Username"

Original PR is #199