FS-3 New functions added for login and register