Further work on register via email