diff --git a/BTCPayServer/Controllers/InvoiceController.UI.cs b/BTCPayServer/Controllers/InvoiceController.UI.cs
index 7eae4a662..832b09ac5 100644
--- a/BTCPayServer/Controllers/InvoiceController.UI.cs
+++ b/BTCPayServer/Controllers/InvoiceController.UI.cs
@@ -112,6 +112,7 @@ namespace BTCPayServer.Controllers
 
 			var model = new PaymentModel()
 			{
+				ServerUrl = HttpContext.Request.GetAbsoluteRoot(),
 				OrderId = invoice.OrderId,
 				InvoiceId = invoice.Id,
 				BTCAddress = invoice.DepositAddress.ToString(),
diff --git a/BTCPayServer/Models/InvoicingModels/PaymentModel.cs b/BTCPayServer/Models/InvoicingModels/PaymentModel.cs
index 1f19e91c9..f10f39e12 100644
--- a/BTCPayServer/Models/InvoicingModels/PaymentModel.cs
+++ b/BTCPayServer/Models/InvoicingModels/PaymentModel.cs
@@ -11,7 +11,10 @@ namespace BTCPayServer.Models.InvoicingModels
 		{
 			get; set;
 		}
-
+		public string ServerUrl
+		{
+			get; set;
+		}
 		public string OrderId
 		{
 			get; set;
diff --git a/BTCPayServer/Views/Invoice/Checkout.cshtml b/BTCPayServer/Views/Invoice/Checkout.cshtml
index 9a68d39a6..42b58c733 100644
--- a/BTCPayServer/Views/Invoice/Checkout.cshtml
+++ b/BTCPayServer/Views/Invoice/Checkout.cshtml
@@ -27,6 +27,7 @@
 			crossorigin="anonymous"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.qrcode/1.0/jquery.qrcode.min.js"></script>
 	<script type="text/javascript">
+		var serverUrl = "@Model.ServerUrl";
 		var invoiceId = "@Model.InvoiceId";
 		var btcAddress = "@Model.BTCAddress";
 		var btcDue = "@Model.BTCDue"; //must be a string
diff --git a/BTCPayServer/wwwroot/js/core.js b/BTCPayServer/wwwroot/js/core.js
index 3f7db71ab..f38ccface 100644
--- a/BTCPayServer/wwwroot/js/core.js
+++ b/BTCPayServer/wwwroot/js/core.js
@@ -69,7 +69,7 @@ function emailForm() {
             // Push the email to a server, once the reception is confirmed move on
             customerEmail = emailAddress;
 
-            var path = "i/" + invoiceId + "/UpdateCustomer";
+            var path = serverUrl + "/i/" + invoiceId + "/UpdateCustomer";
 
             $.ajax({
                 url: path,
@@ -192,7 +192,7 @@ function updateState(status) {
 }
 
 var watcher = setInterval(function () {
-    var path = "i/" + invoiceId + "/status";
+    var path = serverUrl + "/i/" + invoiceId + "/status";
     $.ajax({
         url: path,
         type: "GET"