Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs
===================================================================
diff -u -r8d246ac6328e6e649ff6e78dfe3fac210d789ba0 -rd3a6fe9ed562db5846e576c3f5853ba4ce14fcf2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs	(.../MacroStabilityInwardsInput.cs)	(revision 8d246ac6328e6e649ff6e78dfe3fac210d789ba0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs	(.../MacroStabilityInwardsInput.cs)	(revision d3a6fe9ed562db5846e576c3f5853ba4ce14fcf2)
@@ -39,7 +39,6 @@
         private static readonly Range<int> tangentLineNumberValidityRange = new Range<int>(1, 50);
 
         private RoundedDouble assessmentLevel;
-        private bool useAssessmentLevelManualInput;
         private RoundedDouble slipPlaneMinimumDepth;
         private RoundedDouble slipPlaneMinimumLength;
         private RoundedDouble maximumSliceWidth;
@@ -82,13 +81,13 @@
             {
                 throw new ArgumentNullException(nameof(properties));
             }
+
             if (!IsSmallerEqualOrNaN(properties.TangentLineZBottom, properties.TangentLineZTop))
             {
                 throw new ArgumentException(Resources.MacroStabilityInwardsInput_TangentLineZTop_should_be_larger_than_or_equal_to_TangentLineZBottom);
             }
 
             assessmentLevel = new RoundedDouble(2, double.NaN);
-            useAssessmentLevelManualInput = false;
 
             slipPlaneMinimumDepth = new RoundedDouble(2);
             slipPlaneMinimumLength = new RoundedDouble(2);
@@ -157,23 +156,8 @@
         /// <summary>
         /// Gets or sets whether the assessment level is manual input for the calculation.
         /// </summary>
-        public bool UseAssessmentLevelManualInput
-        {
-            get
-            {
-                return useAssessmentLevelManualInput;
-            }
-            set
-            {
-                useAssessmentLevelManualInput = value;
+        public bool UseAssessmentLevelManualInput { get; set; }
 
-                if (useAssessmentLevelManualInput)
-                {
-                    HydraulicBoundaryLocation = null;
-                }
-            }
-        }
-
         /// <summary>
         /// Gets or sets the surface line.
         /// </summary>
@@ -275,26 +259,14 @@
         /// Gets or sets the outside high water level.
         /// [m+NAP]
         /// </summary>
-        /// <exception cref="InvalidOperationException">Thrown when the user attempts to set the 
-        /// assessment level while <see cref="UseAssessmentLevelManualInput"/> is <c>false</c>.</exception>
         public RoundedDouble AssessmentLevel
         {
             get
             {
-                if (!UseAssessmentLevelManualInput)
-                {
-                    return HydraulicBoundaryLocation?.DesignWaterLevel ?? RoundedDouble.NaN;
-                }
-
                 return assessmentLevel;
             }
             set
             {
-                if (!UseAssessmentLevelManualInput)
-                {
-                    throw new InvalidOperationException("UseAssessmentLevelManualInput is false");
-                }
-
                 assessmentLevel = value.ToPrecision(assessmentLevel.NumberOfDecimalPlaces);
             }
         }