diff --git a/src/EventHub.Domain/Organizations/Organization.cs b/src/EventHub.Domain/Organizations/Organization.cs
index e38c2a2..808216e 100644
--- a/src/EventHub.Domain/Organizations/Organization.cs
+++ b/src/EventHub.Domain/Organizations/Organization.cs
@@ -87,12 +87,12 @@ namespace EventHub.Organizations
                 return this;
             }
             
-            SetPlanType(OrganizationPlanType.Free, DateTime.Today);
+            SetPlanType(OrganizationPlanType.Free);
 
             return this;
         }
 
-        private Organization SetPlanType(OrganizationPlanType planType, DateTime endDate)
+        private Organization SetPlanType(OrganizationPlanType planType, DateTime? endDate = null)
         {
             if (!Enum.IsDefined(typeof(OrganizationPlanType), planType))
             {