Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs
===================================================================
diff -u -re2786bbbad5456a4b42b68e1d0b0f85f732393d7 -ra37adf7a6d10fa2c6a069bc6d423a14c22ead9ea
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs	(.../MacroStabilityInwardsCalculationService.cs)	(revision e2786bbbad5456a4b42b68e1d0b0f85f732393d7)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs	(.../MacroStabilityInwardsCalculationService.cs)	(revision a37adf7a6d10fa2c6a069bc6d423a14c22ead9ea)
@@ -193,24 +193,24 @@
                     DikeSoilScenario = inputParameters.DikeSoilScenario,
                     WaterLevelRiverAverage = inputParameters.WaterLevelRiverAverage,
                     WaterLevelPolder = inputParameters.WaterLevelPolder,
-                    XCoordinateDrainageConstruction = inputParameters.XCoordinateDrainageConstruction,
-                    ZCoordinateDrainageConstruction = inputParameters.ZCoordinateDrainageConstruction,
+                    DrainageConstructionPresent = inputParameters.DrainageConstructionPresent,
+                    XCoordinateDrainageConstruction = inputParameters.DrainageConstructionPresent ? inputParameters.XCoordinateDrainageConstruction : double.NaN,
+                    ZCoordinateDrainageConstruction = inputParameters.DrainageConstructionPresent ? inputParameters.ZCoordinateDrainageConstruction : double.NaN,
                     MinimumLevelPhreaticLineAtDikeTopRiver = inputParameters.MinimumLevelPhreaticLineAtDikeTopRiver,
                     MinimumLevelPhreaticLineAtDikeTopPolder = inputParameters.MinimumLevelPhreaticLineAtDikeTopPolder,
-                    PhreaticLineOffsetBelowDikeTopAtRiver = inputParameters.PhreaticLineOffsetBelowDikeTopAtRiver,
-                    PhreaticLineOffsetBelowDikeTopAtPolder = inputParameters.PhreaticLineOffsetBelowDikeTopAtPolder,
-                    PhreaticLineOffsetBelowShoulderBaseInside = inputParameters.PhreaticLineOffsetBelowShoulderBaseInside,
-                    PhreaticLineOffsetBelowDikeToeAtPolder = inputParameters.PhreaticLineOffsetBelowDikeToeAtPolder,
+                    UseDefaultOffsets = inputParameters.UseDefaultOffsets,
+                    PhreaticLineOffsetBelowDikeTopAtRiver = !inputParameters.UseDefaultOffsets ? inputParameters.PhreaticLineOffsetBelowDikeTopAtRiver : double.NaN,
+                    PhreaticLineOffsetBelowDikeTopAtPolder = !inputParameters.UseDefaultOffsets ? inputParameters.PhreaticLineOffsetBelowDikeTopAtPolder : double.NaN,
+                    PhreaticLineOffsetBelowShoulderBaseInside = !inputParameters.UseDefaultOffsets ? inputParameters.PhreaticLineOffsetBelowShoulderBaseInside : double.NaN,
+                    PhreaticLineOffsetBelowDikeToeAtPolder = !inputParameters.UseDefaultOffsets ? inputParameters.PhreaticLineOffsetBelowDikeToeAtPolder : double.NaN,
                     LeakageLengthOutwardsPhreaticLine3 = inputParameters.LeakageLengthOutwardsPhreaticLine3,
                     LeakageLengthInwardsPhreaticLine3 = inputParameters.LeakageLengthInwardsPhreaticLine3,
                     LeakageLengthOutwardsPhreaticLine4 = inputParameters.LeakageLengthOutwardsPhreaticLine4,
                     LeakageLengthInwardsPhreaticLine4 = inputParameters.LeakageLengthInwardsPhreaticLine4,
                     PiezometricHeadPhreaticLine2Outwards = inputParameters.PiezometricHeadPhreaticLine2Outwards,
                     PiezometricHeadPhreaticLine2Inwards = inputParameters.PiezometricHeadPhreaticLine2Inwards,
                     PenetrationLength = inputParameters.PenetrationLength,
-                    DrainageConstructionPresent = inputParameters.DrainageConstructionPresent,
                     AdjustPhreaticLine3And4ForUplift = inputParameters.AdjustPhreaticLine3And4ForUplift,
-                    UseDefaultOffsets = inputParameters.UseDefaultOffsets,
                     MoveGrid = inputParameters.MoveGrid,
                     MaximumSliceWidth = inputParameters.MaximumSliceWidth,
                     GridAutomaticDetermined = inputParameters.GridDeterminationType == MacroStabilityInwardsGridDeterminationType.Automatic,