Removed email functionality and fixed to registration form