Made changes to enable registration of new users and to also cater to the changes on the server-side