Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
===================================================================
diff -u -r3899 -r3919
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs	(.../DamProject.cs)	(revision 3899)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs	(.../DamProject.cs)	(revision 3919)
@@ -330,6 +330,10 @@
                 damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.Add(new DamFailureMechanismeCalculationSpecification());
                 UpdateForOlderProjects();
             }
+            if (damProjectData != null) 
+            {
+                DataEventPublisher.AfterChange(damProjectData, "MaxCalculationCores");
+            }
             return damProjectData;
         }
 
Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs
===================================================================
diff -u -r3896 -r3919
--- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 3896)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 3919)
@@ -149,7 +149,7 @@
             }
             set
             {
-                if (damProject != null && damProject.DamProjectData != null)
+                if (damProject != null && damProject.DamProjectData != null && damProject.DamProjectData.MaxCalculationCores != value)
                 {
                     damProject.DamProjectData.MaxCalculationCores = value;
                 }
@@ -194,6 +194,7 @@
 
             // This is to force the version type (Alpha, Pre-Alpha etc.) to be updated 
             mainForm.ReloadManager.ApplyCurrentUiCultureToAll();
+            MaxCalculationCores = Math.Max(Environment.ProcessorCount - 1, 1);
         }
 
         /// <summary>
@@ -884,6 +885,11 @@
                         DataEventPublisher.DataListModified(this.damProject.DamProjectData.Locations);
                     }
                 }
+
+                if (e.Property != null && e.Property.Equals("MaxCalculationCores"))
+                {
+                    mainForm.MaxCalculationCores = damProject.DamProjectData.MaxCalculationCores;
+                }
             }
             else if (sender == this.damProject.DamProjectData.WaterBoard)
             {