With fix for user profile update