diff --git a/BTCPayServer/Controllers/AppsController.Crowdsale.cs b/BTCPayServer/Controllers/AppsController.Crowdsale.cs
index 550c21e87..230193504 100644
--- a/BTCPayServer/Controllers/AppsController.Crowdsale.cs
+++ b/BTCPayServer/Controllers/AppsController.Crowdsale.cs
@@ -93,6 +93,12 @@ namespace BTCPayServer.Controllers
             {
                 ModelState.AddModelError(nameof(vm.PerksTemplate), "Invalid template");
             }
+
+            if (Enum.Parse<CrowdfundResetEvery>(vm.ResetEvery) != CrowdfundResetEvery.Never && !vm.StartDate.HasValue)
+            {
+                ModelState.AddModelError(nameof(vm.StartDate), "A start date is needed when the goal resets every X amount of time.");
+            }
+            
             if (!ModelState.IsValid)
             {
                 return View(vm);
diff --git a/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml b/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml
index 12897b668..dde7596d0 100644
--- a/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml
+++ b/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml
@@ -44,22 +44,22 @@
                     </div> 
                     
                     <div class="form-group">
-                        <label asp-for="Tagline" class="control-label"></label>*
+                        <label asp-for="Tagline" class="control-label"></label>
                         <input asp-for="Tagline" class="form-control" />
                         <span asp-validation-for="Tagline" class="text-danger"></span>
                     </div>
                     <div class="form-group">
-                        <label asp-for="Description" class="control-label"></label>*
+                        <label asp-for="Description" class="control-label"></label>
                         <textarea asp-for="Description" rows="20" cols="40" class="form-control richtext"></textarea>
                         <span asp-validation-for="Description" class="text-danger"></span>
                     </div>
                     <div class="form-group">
-                        <label asp-for="TargetCurrency" class="control-label"></label>*
+                        <label asp-for="TargetCurrency" class="control-label"></label>
                         <input asp-for="TargetCurrency" class="form-control" />
                         <span asp-validation-for="TargetCurrency" class="text-danger"></span>
                     </div>
                     <div class="form-group">
-                        <label asp-for="TargetAmount" class="control-label"></label>*
+                        <label asp-for="TargetAmount" class="control-label"></label>
                         <input asp-for="TargetAmount" class="form-control" />
                         <span asp-validation-for="TargetAmount" class="text-danger"></span>
                     </div>
@@ -70,7 +70,7 @@
                         <span asp-validation-for="EnforceTargetAmount" class="text-danger"></span>
                     </div> 
                     <div class="form-group">
-                        <label asp-for="StartDate" class="control-label"></label>*
+                        <label asp-for="StartDate" class="control-label"></label>
                         <input asp-for="StartDate" class="form-control datetime " />
                         <span asp-validation-for="StartDate" class="text-danger"></span>
                     </div>
@@ -89,7 +89,7 @@
                     </div>
                     
                     <div class="form-group">
-                        <label asp-for="EndDate" class="control-label"></label>*
+                        <label asp-for="EndDate" class="control-label"></label>
                         <input asp-for="EndDate" class="form-control datetime" />
                         <span asp-validation-for="EndDate" class="text-danger"></span>
                     </div>
@@ -102,7 +102,7 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label asp-for="PerksTemplate" class="control-label"></label>*
+                        <label asp-for="PerksTemplate" class="control-label"></label>
                         <textarea asp-for="PerksTemplate" rows="10" cols="40" class="js-product-template form-control"></textarea>
                         <span asp-validation-for="PerksTemplate" class="text-danger"></span>
                     </div>
@@ -128,8 +128,6 @@
                         <input asp-for="NotificationUrl" class="form-control" />
                         <span asp-validation-for="NotificationUrl" class="text-danger"></span>
                     </div>
-
-
                     <div class="form-group">
                         <label asp-for="Enabled"></label>
                         <input asp-for="Enabled" type="checkbox" class="form-check"/>