Preparing for RC
Name refactoring, removed email validation (WIP)