diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ConfigurationBootstrap.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ConfigurationBootstrap.java
index 1e2b6e77d..3d8007688 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ConfigurationBootstrap.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ConfigurationBootstrap.java
@@ -114,8 +114,8 @@ public class ConfigurationBootstrap implements IConfigurationBootstrap {
 
         Capacity eightHours = Capacity.create(EffortDuration.hours(8))
                 .overAssignableWithoutLimit(true);
-        Capacity zeroCapacity = Capacity.zero()
-                .overAssignableWithoutLimit(true);
+        Capacity zeroCapacity = Capacity.zero().overAssignableWithoutLimit(
+                false);
         calendar.setCapacityAt(Days.MONDAY, eightHours);
         calendar.setCapacityAt(Days.TUESDAY, eightHours);
         calendar.setCapacityAt(Days.WEDNESDAY, eightHours);
diff --git a/navalplanner-business/src/main/resources/db.changelog-1.0.xml b/navalplanner-business/src/main/resources/db.changelog-1.0.xml
index eef760ba7..a57bfe7ef 100644
--- a/navalplanner-business/src/main/resources/db.changelog-1.0.xml
+++ b/navalplanner-business/src/main/resources/db.changelog-1.0.xml
@@ -56,4 +56,11 @@
                       newColumnName="standard_effort" columnDataType="INTEGER"/>
     </changeSet>
 
+    <changeSet id="by_default_weekends_are_not_overassignable" author="ogonzalez">
+        <comment>By default weekends are not over assignable</comment>
+        <sql>
+        update capacity_per_day SET allowed_extra_effort = 0
+        where day_id IN (5, 6) AND allowed_extra_effort IS NULL
+        </sql>
+    </changeSet>
 </databaseChangeLog>