updated with addition in user_support plugin