CRM-13863 - Fix for save & new