Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r6b51811e319a479d35a3446dfed98b129e8ac09c -rb0ae25843b5531dcc544c0e798a9134b3d4fc4bc
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs)	(revision 6b51811e319a479d35a3446dfed98b129e8ac09c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs)	(revision b0ae25843b5531dcc544c0e798a9134b3d4fc4bc)
@@ -200,7 +200,7 @@
 
             try
             {
-                return failureMechanismSectionResult.UseManualAssemblyCategoryGroup
+                return failureMechanismSectionResult.UseManualAssemblyCategoryGroup && useManual
                            ? ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(failureMechanismSectionResult.ManualAssemblyCategoryGroup)
                            : AssembleCombinedAssessment(failureMechanismSectionResult);
             }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r6b51811e319a479d35a3446dfed98b129e8ac09c -rb0ae25843b5531dcc544c0e798a9134b3d4fc4bc
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs)	(revision 6b51811e319a479d35a3446dfed98b129e8ac09c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs)	(revision b0ae25843b5531dcc544c0e798a9134b3d4fc4bc)
@@ -200,7 +200,7 @@
 
             try
             {
-                return failureMechanismSectionResult.UseManualAssemblyCategoryGroup
+                return failureMechanismSectionResult.UseManualAssemblyCategoryGroup && useManual
                            ? ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(failureMechanismSectionResult.ManualAssemblyCategoryGroup)
                            : AssembleCombinedAssessment(failureMechanismSectionResult);
             }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r6b51811e319a479d35a3446dfed98b129e8ac09c -rb0ae25843b5531dcc544c0e798a9134b3d4fc4bc
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactory.cs	(.../MicrostabilityFailureMechanismAssemblyFactory.cs)	(revision 6b51811e319a479d35a3446dfed98b129e8ac09c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactory.cs	(.../MicrostabilityFailureMechanismAssemblyFactory.cs)	(revision b0ae25843b5531dcc544c0e798a9134b3d4fc4bc)
@@ -200,7 +200,7 @@
 
             try
             {
-                return failureMechanismSectionResult.UseManualAssemblyCategoryGroup
+                return failureMechanismSectionResult.UseManualAssemblyCategoryGroup && useManual
                            ? ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(failureMechanismSectionResult.ManualAssemblyCategoryGroup)
                            : AssembleCombinedAssessment(failureMechanismSectionResult);
             }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r6b51811e319a479d35a3446dfed98b129e8ac09c -rb0ae25843b5531dcc544c0e798a9134b3d4fc4bc
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactory.cs	(.../PipingStructureFailureMechanismAssemblyFactory.cs)	(revision 6b51811e319a479d35a3446dfed98b129e8ac09c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactory.cs	(.../PipingStructureFailureMechanismAssemblyFactory.cs)	(revision b0ae25843b5531dcc544c0e798a9134b3d4fc4bc)
@@ -200,7 +200,7 @@
 
             try
             {
-                return failureMechanismSectionResult.UseManualAssemblyCategoryGroup
+                return failureMechanismSectionResult.UseManualAssemblyCategoryGroup && useManual
                            ? ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(failureMechanismSectionResult.ManualAssemblyCategoryGroup)
                            : AssembleCombinedAssessment(failureMechanismSectionResult);
             }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r6b51811e319a479d35a3446dfed98b129e8ac09c -rb0ae25843b5531dcc544c0e798a9134b3d4fc4bc
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs)	(revision 6b51811e319a479d35a3446dfed98b129e8ac09c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs)	(revision b0ae25843b5531dcc544c0e798a9134b3d4fc4bc)
@@ -166,7 +166,7 @@
 
             try
             {
-                return failureMechanismSectionResult.UseManualAssemblyCategoryGroup
+                return failureMechanismSectionResult.UseManualAssemblyCategoryGroup && useManual
                            ? ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(failureMechanismSectionResult.ManualAssemblyCategoryGroup)
                            : AssembleCombinedAssessment(failureMechanismSectionResult);
             }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r6b51811e319a479d35a3446dfed98b129e8ac09c -rb0ae25843b5531dcc544c0e798a9134b3d4fc4bc
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactory.cs	(.../TechnicalInnovationFailureMechanismAssemblyFactory.cs)	(revision 6b51811e319a479d35a3446dfed98b129e8ac09c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactory.cs	(.../TechnicalInnovationFailureMechanismAssemblyFactory.cs)	(revision b0ae25843b5531dcc544c0e798a9134b3d4fc4bc)
@@ -166,7 +166,7 @@
 
             try
             {
-                return failureMechanismSectionResult.UseManualAssemblyCategoryGroup
+                return failureMechanismSectionResult.UseManualAssemblyCategoryGroup && useManual
                            ? ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(failureMechanismSectionResult.ManualAssemblyCategoryGroup)
                            : AssembleCombinedAssessment(failureMechanismSectionResult);
             }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r6b51811e319a479d35a3446dfed98b129e8ac09c -rb0ae25843b5531dcc544c0e798a9134b3d4fc4bc
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs	(.../WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs)	(revision 6b51811e319a479d35a3446dfed98b129e8ac09c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs	(.../WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs)	(revision b0ae25843b5531dcc544c0e798a9134b3d4fc4bc)
@@ -166,7 +166,7 @@
 
             try
             {
-                return failureMechanismSectionResult.UseManualAssemblyCategoryGroup
+                return failureMechanismSectionResult.UseManualAssemblyCategoryGroup && useManual
                            ? ManualFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(failureMechanismSectionResult.ManualAssemblyCategoryGroup)
                            : AssembleCombinedAssessment(failureMechanismSectionResult);
             }