Added validation for user and content