Fixed #917: Defect - Unable to switch from Dovecot to Courier
Small fixes