diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
index 560cf76a0..462a48d47 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
@@ -146,6 +146,9 @@ public class WorkerCRUDController extends GenericForwardComposer implements
             if (workerModel.getWorker().isVirtual()) {
                 workerModel.setCapacity(getVirtualWorkerCapacity());
             }
+            if (workerModel.getCalendar() == null) {
+                createCalendar();
+            }
             workerModel.save();
             goToList();
             Util.reloadBindings(listWindow);