fix registration (we have it in 2 places), do the check of email #17