Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStability/MStabXmlDoc.cs
===================================================================
diff -u -r698 -r711
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStability/MStabXmlDoc.cs	(.../MStabXmlDoc.cs)	(revision 698)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStability/MStabXmlDoc.cs	(.../MStabXmlDoc.cs)	(revision 711)
@@ -125,13 +125,16 @@
                 failureMechanismeParamatersMStab.MStabParameters.ZoneAreas = new MStabZoneAreas
                 {
                     DikeTableHeight = dikeTableHeight.Value,
-                    DikeTableWidth = scenario.Location.ZoneAreaRestSlopeCrestWidth,
                     SafetyFactorZone1A = scenario.ModelFactors.RequiredSafetyFactorStabilityInnerSlope ?? requiredSafetyFactor,
                     SafetyFactorZone1B = scenario.ModelFactors.RequiredSafetyFactorStabilityInnerSlope ?? requiredSafetyFactor,
                     XCoordinateDikeTopAtPolder = dikeTopAtPolder.X,
                     XCoordinateDikeTopAtRiver = surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).X,
                     XCoordinateStartRestProfile = surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).X
                 };
+                if (scenario.Location.StabilityOptions?.ZoneAreaRestSlopeCrestWidth != null)
+                {
+                    failureMechanismeParamatersMStab.MStabParameters.ZoneAreas.DikeTableWidth = scenario.Location.StabilityOptions.ZoneAreaRestSlopeCrestWidth.Value;
+                }
             }
 
             if (failureMechanismeParamatersMStab.MStabParameters.CalculationOptions.ZonesType.Equals(MStabZonesType.ForbiddenZone))
@@ -210,8 +213,13 @@
         {
             var dikeTopAtPolder = surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder);
             // Zonestype is ForbiddenZone; TODO: Combine with code in StabilityCalculator?
-            double maxZoneX = dikeTopAtPolder.X +
-                              scenario.Location.ForbiddenZoneFactor * (surfaceLine.GetDikeToeInward().X - dikeTopAtPolder.X);
+            var zoneFactor = 1.0;
+            if (scenario.Location.StabilityOptions?.ForbiddenZoneFactor != null)
+            {
+                zoneFactor = scenario.Location.StabilityOptions.ForbiddenZoneFactor.Value;
+            }
+            double maxZoneX = dikeTopAtPolder.X + zoneFactor * 
+                (surfaceLine.GetDikeToeInward().X - dikeTopAtPolder.X);
             return new MStabForbiddenZone
             {
                 IsXEntryMinUsed = false,