diff --git a/BTCPayServer/Models/StoreViewModels/UpdateCoinSwitchSettingsViewModel.cs b/BTCPayServer/Models/StoreViewModels/UpdateCoinSwitchSettingsViewModel.cs
index 12e92a9d4..41d146451 100644
--- a/BTCPayServer/Models/StoreViewModels/UpdateCoinSwitchSettingsViewModel.cs
+++ b/BTCPayServer/Models/StoreViewModels/UpdateCoinSwitchSettingsViewModel.cs
@@ -10,7 +10,7 @@ namespace BTCPayServer.Models.StoreViewModels
         public string MerchantId { get; set; }
         public bool Enabled { get; set; }
 
-        [Display(Name = "Mode, Choose how to show CoinSwitch")]
+        [Display(Name = "Integration Mode")]
         public string Mode { get; set; } = "popup";
 
         public List<SelectListItem> Modes { get; } = new List<SelectListItem>
diff --git a/BTCPayServer/Views/Invoice/Checkout-Body.cshtml b/BTCPayServer/Views/Invoice/Checkout-Body.cshtml
index 1bae4d704..e9c046c45 100644
--- a/BTCPayServer/Views/Invoice/Checkout-Body.cshtml
+++ b/BTCPayServer/Views/Invoice/Checkout-Body.cshtml
@@ -310,8 +310,7 @@
                     
                         <changelly inline-template
                                    v-if="!srvModel.coinSwitchEnabled || selectedThirdPartyProcessor === 'changelly'"
-                                   :merchant-id="srvModel.
-"
+                                   :merchant-id="srvModel.changellyMerchantId"
                                    :store-id="srvModel.storeId"
                                    :to-currency="srvModel.paymentMethodId"
                                    :to-currency-due="srvModel.changellyAmountDue"
diff --git a/BTCPayServer/Views/Stores/UpdateCoinSwitchSettings.cshtml b/BTCPayServer/Views/Stores/UpdateCoinSwitchSettings.cshtml
index 5fa54a842..8a1cb2035 100644
--- a/BTCPayServer/Views/Stores/UpdateCoinSwitchSettings.cshtml
+++ b/BTCPayServer/Views/Stores/UpdateCoinSwitchSettings.cshtml
@@ -22,15 +22,16 @@
                 <input asp-for="MerchantId" class="form-control"/>
                 <span asp-validation-for="MerchantId" class="text-danger"></span>
             </div>
+            <div class="form-group">
+                <label asp-for="Mode"></label>
+                <select asp-for="Mode" asp-items="Model.Modes" class="form-control" >
+                </select>
+            </div>
+            
             <div class="form-group">
                 <label asp-for="Enabled"></label>
                 <input asp-for="Enabled" type="checkbox" class="form-check"/>
             </div>
-            <div class="form-group">
-                <label asp-for="Mode"></label>
-                <select asp-for="Mode" asp-items="Model.Modes" >
-                </select>
-            </div>
             <button name="command" type="submit" value="save" class="btn btn-primary">Submit</button>
         </form>
     </div>
diff --git a/BTCPayServer/wwwroot/checkout/coinswitch.html b/BTCPayServer/wwwroot/checkout/coinswitch.html
index a867463d2..e9dd6e509 100644
--- a/BTCPayServer/wwwroot/checkout/coinswitch.html
+++ b/BTCPayServer/wwwroot/checkout/coinswitch.html
@@ -4,6 +4,7 @@
     <meta charset="UTF-8">
     <title>CoinSwitch</title>
     <script>
+        debugger;
         var script = document.createElement('script'),
             head = document.head || document.getElementsByTagName('head')[0];
         script.src = window.location.protocol + '//files.coinswitch.co/public/js/cs_switch.js';