Updated code to fix user related issues
Updated code to fix user profile related issues