Email as username registration tweaks