Revert using of username
Implement validation of the mail / account