diff --git a/BTCPayServer/Models/AppViewModels/UpdateCrowdfundViewModel.cs b/BTCPayServer/Models/AppViewModels/UpdateCrowdfundViewModel.cs
index e678f5513..2613eb271 100644
--- a/BTCPayServer/Models/AppViewModels/UpdateCrowdfundViewModel.cs
+++ b/BTCPayServer/Models/AppViewModels/UpdateCrowdfundViewModel.cs
@@ -46,6 +46,7 @@ namespace BTCPayServer.Models.AppViewModels
         public string TargetCurrency { get; set; } = "BTC";
 
         [Display(Name = "Set a Target amount ")]
+        [Range(0, double.PositiveInfinity)]
         public decimal? TargetAmount { get; set; }
 
 
diff --git a/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs b/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs
index 919bd5b2c..2bcc31fdd 100644
--- a/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs
+++ b/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs
@@ -48,7 +48,7 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
 
         public string Id { get; set; }
         [Required] public string StoreId { get; set; }
-        [Required] public decimal Amount { get; set; }
+        [Required][Range(0, double.PositiveInfinity)]public decimal Amount { get; set; }
 
         [Display(Name = "The currency used for payment request. (e.g. BTC, LTC, USD, etc.)")]
         public string Currency { get; set; }
diff --git a/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml b/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml
index 576e6d175..b81e7ec30 100644
--- a/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml
+++ b/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml
@@ -1,4 +1,4 @@
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
 @model UpdateCrowdfundViewModel
 @{
     ViewData["Title"] = "Update Crowdfund";
@@ -67,8 +67,8 @@
                     <div class="form-group">
                         <label asp-for="StartDate" class="control-label"></label>
                         <div class="input-group ">
-                            <input asp-for="StartDate" class="form-control datetime"/>
-                            <div class="input-group-append only-for-js">
+                            <input asp-for="StartDate" class="form-control datetime"  placeholder="No start date has been set for this crowdfund"/>
+                            <div class="input-group-append">
 
                                 <button class="btn btn-secondary input-group-clear" type="button" title="Clear">
                                     <span class=" fa fa-times"></span>
@@ -93,8 +93,8 @@
                     <div class="form-group">
                         <label asp-for="EndDate" class="control-label"></label>
                         <div class="input-group ">
-                            <input asp-for="EndDate" class="form-control datetime" />
-                            <div class="input-group-append only-for-js">
+                            <input asp-for="EndDate" class="form-control datetime"  placeholder="No end date has been set for this crowdfund" />
+                            <div class="input-group-append">
 
                                 <button class="btn btn-secondary input-group-clear" type="button" title="Clear">
                                     <span class=" fa fa-times"></span>
diff --git a/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml b/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml
index 5328a98f6..9ef8cf0b9 100644
--- a/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml
+++ b/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml
@@ -34,7 +34,7 @@
 
                     <div class="form-group">
                         <label asp-for="Currency" class="control-label"></label>*
-                        <input placeholder="BTC" asp-for="Currency" class="form-control"/>
+                        <input  asp-for="Currency" class="form-control"/>
                         <span asp-validation-for="Currency" class="text-danger"></span>
                     </div>
                     <div class="form-group">
@@ -66,8 +66,8 @@
                     <div class="form-group">
                         <label asp-for="ExpiryDate" class="control-label"></label>
                         <div class="input-group ">
-                            <input asp-for="ExpiryDate" class="form-control datetime" min="today"/>
-                            <div class="input-group-append only-for-js">
+                            <input asp-for="ExpiryDate" class="form-control datetime" min="today" placeholder="No expiry date has been set for this payment request"/>
+                            <div class="input-group-append">
 
                                 <button class="btn btn-secondary input-group-clear" type="button" title="Clear">
                                     <span class=" fa fa-times"></span>
diff --git a/BTCPayServer/wwwroot/main/css/site.css b/BTCPayServer/wwwroot/main/css/site.css
index f2dfca6cb..388630c44 100644
--- a/BTCPayServer/wwwroot/main/css/site.css
+++ b/BTCPayServer/wwwroot/main/css/site.css
@@ -16,6 +16,6 @@
 }
 
 
-.only-for-js{
+.only-for-js, .input-group-clear{
     display: none;
 }
diff --git a/BTCPayServer/wwwroot/main/site.js b/BTCPayServer/wwwroot/main/site.js
index 8cf3c59d4..ebd8f9081 100644
--- a/BTCPayServer/wwwroot/main/site.js
+++ b/BTCPayServer/wwwroot/main/site.js
@@ -8,9 +8,28 @@
     });
 
 
-    $(".input-group-clear").on("click", function(){
+    $(".input-group-clear").on("click", function () {
         $(this).parents(".input-group").find("input").val(null);
+        handleInputGroupClearButtonDisplay(this);
     });
 
+    $(".input-group-clear").each(function () {
+        var inputGroupClearBtn = this;
+        handleInputGroupClearButtonDisplay(inputGroupClearBtn);
+        $(this).parents(".input-group").find("input").on("change input", function () {
+            handleInputGroupClearButtonDisplay(inputGroupClearBtn);
+        })
+    });
+
+
     $(".only-for-js").show();
+
+    function handleInputGroupClearButtonDisplay(element) {
+        var value = $(element).parents(".input-group").find("input").val();
+        if (!value) {
+            $(element).hide();
+        } else {
+            $(element).show();
+        }
+    }
 });