Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/FailureMechanismContributionContextProperties.cs
===================================================================
diff -u -rc18f1b5eca111867195ebedf813fae22a12ce793 -r0916bc9808f7c527e16e75a5404b800d2bd223c5
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/FailureMechanismContributionContextProperties.cs	(.../FailureMechanismContributionContextProperties.cs)	(revision c18f1b5eca111867195ebedf813fae22a12ce793)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/FailureMechanismContributionContextProperties.cs	(.../FailureMechanismContributionContextProperties.cs)	(revision 0916bc9808f7c527e16e75a5404b800d2bd223c5)
@@ -25,6 +25,7 @@
 using Core.Common.Base;
 using Core.Common.Gui.Attributes;
 using Core.Common.Gui.PropertyBag;
+using Core.Common.Utils;
 using Core.Common.Utils.Attributes;
 using Core.Common.Utils.Reflection;
 using Ringtoets.Common.Data.AssessmentSection;
@@ -43,7 +44,7 @@
         private IFailureMechanismContributionNormChangeHandler normChangeHandler;
         private IAssessmentSectionCompositionChangeHandler compositionChangeHandler;
 
-        [TypeConverter(typeof(EnumConverter))]
+        [TypeConverter(typeof(EnumTypeConverter))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")]
         [ResourcesDisplayName(typeof(Resources), "FailureMechanismContribution_Composition_DisplayName")]
         [ResourcesDescription(typeof(Resources), "FailureMechanismContribution_Composition_Description")]
@@ -62,6 +63,8 @@
                     {
                         changedObject.NotifyObservers();
                     }
+
+                    data.NotifyObservers();
                 }
             }
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionContextPropertiesTest.cs
===================================================================
diff -u -rc8f94bae0d4f9b0c33bfd871991a969b203e3f45 -r0916bc9808f7c527e16e75a5404b800d2bd223c5
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionContextPropertiesTest.cs	(.../FailureMechanismContributionContextPropertiesTest.cs)	(revision c8f94bae0d4f9b0c33bfd871991a969b203e3f45)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionContextPropertiesTest.cs	(.../FailureMechanismContributionContextPropertiesTest.cs)	(revision 0916bc9808f7c527e16e75a5404b800d2bd223c5)
@@ -22,6 +22,7 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
+using Core.Common.Base;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
@@ -149,7 +150,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void GivenReturnPeriod_WhenConfirmingChanges_ReturnPeriodSet(bool confirmChange)
+        public void GivenReturnPeriod_WhenConfirmingChanges_ReturnPeriodSetAndNotifiesObserver(bool confirmChange)
         {
             // Given
             AssessmentSection assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
@@ -162,6 +163,18 @@
             compositionChangeHandler.Stub(h => h.ConfirmCompositionChange()).Return(false);
             mocks.ReplayAll();
 
+            var observer = mocks.StrictMock<IObserver>();
+            failureMechanismContribution.Attach(observer);
+            if (confirmChange)
+            {
+                observer.Expect(o => o.UpdateObserver());
+            }
+            else
+            {
+                observer.Expect(o => o.UpdateObserver()).Repeat.Never();
+            }
+            mocks.ReplayAll();
+
             var properties = new FailureMechanismContributionContextProperties()
             {
                 Data = failureMechanismContribution,
@@ -197,7 +210,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void GivenAssessmentSectionComposition_WhenConfirmingChanges_AssessmentSectionCompositionSet(bool confirmChange)
+        public void GivenAssessmentSectionComposition_WhenConfirmingChanges_AssessmentSectionCompositionSetAndNotifiesObserver(bool confirmChange)
         {
             // Given
             const AssessmentSectionComposition originalComposition = AssessmentSectionComposition.Dike;
@@ -209,7 +222,19 @@
             var normChangeHandler = mocks.Stub<IFailureMechanismContributionNormChangeHandler>();
             normChangeHandler.Stub(h => h.ConfirmNormChange())
                              .Return(false);
+
+            var observer = mocks.StrictMock<IObserver>();
+            failureMechanismContribution.Attach(observer);
+            if (confirmChange)
+            {
+                observer.Expect(o => o.UpdateObserver());
+            }
+            else
+            {
+                observer.Expect(o => o.UpdateObserver()).Repeat.Never();
+            }
             mocks.ReplayAll();
+            
 
             var properties = new FailureMechanismContributionContextProperties()
             {