Changed logic and validations for registration

Tested Registration modules and made changes