Added more checks for the user profile