Fix common CRM settings CRM-12339