Added mail service and changes in registration