CRM-14850 more copy & paste protection