MIFOSX-1535 : added condition to set the default value