diff --git a/BTCPayServer.Tests/SeleniumTester.cs b/BTCPayServer.Tests/SeleniumTester.cs
index 93aac8a42..641c4c09f 100644
--- a/BTCPayServer.Tests/SeleniumTester.cs
+++ b/BTCPayServer.Tests/SeleniumTester.cs
@@ -212,8 +212,6 @@ namespace BTCPayServer.Tests
             {
                 Assert.True(Driver.FindElement(By.Id("LightningNodeType-Internal")).Enabled, "Usage of the internal Lightning node is disabled.");
                 Driver.FindElement(By.CssSelector("label[for=\"LightningNodeType-Internal\"]")).Click();
-
-                Driver.FindElement(By.Id("saveInternal")).Click();
             }
             else
             {
@@ -222,10 +220,9 @@ namespace BTCPayServer.Tests
 
                 Driver.FindElement(By.Id("test")).Click();
                 Assert.Contains("Connection to the Lightning node successful.", FindAlertMessage().Text);
-
-                Driver.FindElement(By.Id("saveCustom")).Click();
             }
 
+            Driver.FindElement(By.Id("save")).Click();
             Assert.Contains($"{cryptoCode} Lightning node updated.", FindAlertMessage().Text);
 
             var enabled = Driver.FindElement(By.Id($"{cryptoCode}LightningEnabled"));
diff --git a/BTCPayServer.Tests/UnitTest1.cs b/BTCPayServer.Tests/UnitTest1.cs
index 45a2fa49b..8204c474d 100644
--- a/BTCPayServer.Tests/UnitTest1.cs
+++ b/BTCPayServer.Tests/UnitTest1.cs
@@ -1006,7 +1006,7 @@ namespace BTCPayServer.Tests
                     }, "save", "BTC").GetAwaiter().GetResult());
 
                 // Make sure old connection string format does not work
-                Assert.IsType<ViewResult>(storeController.SetupLightningNode(user.StoreId,
+                Assert.IsType<RedirectToActionResult>(storeController.SetupLightningNode(user.StoreId,
                     new LightningNodeViewModel { ConnectionString = tester.MerchantCharge.Client.Uri.AbsoluteUri },
                     "save", "BTC").GetAwaiter().GetResult());
 
diff --git a/BTCPayServer/Views/Stores/SetupLightningNode.cshtml b/BTCPayServer/Views/Stores/SetupLightningNode.cshtml
index c91b41d3e..3f81d78b6 100644
--- a/BTCPayServer/Views/Stores/SetupLightningNode.cshtml
+++ b/BTCPayServer/Views/Stores/SetupLightningNode.cshtml
@@ -30,6 +30,7 @@
         margin-right: 2rem;
         color: var(--btcpay-color-warning);
     }
+    #save { min-width: 7rem; }
     #InternalSetup, #CustomSetup, #LightningNodeType-Internal, #LightningNodeType-Custom { display: none; }
     #LightningNodeType-Internal:checked + * + * + * + #InternalSetup,
     #LightningNodeType-Custom:checked + * + *+ #CustomSetup { display: block; }
@@ -80,7 +81,6 @@
         @if (Model.CanUseInternalNode)
         {
             <p class="my-4">That's it, no need to configure anything else.</p>
-            <button id="saveInternal" name="command" type="submit" value="save" class="btn btn-primary mr-2">Use internal node</button>
         }
         else
         {
@@ -152,7 +152,9 @@
                 </div>
             </li>
         </ul>
-        <button id="saveCustom" name="command" type="submit" value="save" class="btn btn-primary mr-2">Use custom node</button>
+    </div>
+    <div class="text-left">
+        <button id="save" name="command" type="submit" value="save" class="btn btn-primary mr-2">Save</button>
     </div>
 </form>
 
diff --git a/BTCPayServer/Views/Stores/UpdateStore.cshtml b/BTCPayServer/Views/Stores/UpdateStore.cshtml
index af31aed98..643cdae58 100644
--- a/BTCPayServer/Views/Stores/UpdateStore.cshtml
+++ b/BTCPayServer/Views/Stores/UpdateStore.cshtml
@@ -112,15 +112,15 @@
                                 @if (isSetUp)
                                 {
                                     <span class="smMaxWidth text-truncate text-secondary mr-3">@scheme.Address</span>
+                                    <a class="text-secondary"
+                                       asp-controller="PublicLightningNodeInfo"
+                                       asp-action="ShowLightningNodeInfo"
+                                       asp-route-cryptoCode="@scheme.CryptoCode"
+                                       asp-route-storeId="@Model.Id"
+                                       target="_blank">
+                                        Public Node Info
+                                    </a>
                                 }
-                                <a class="text-secondary"
-                                   asp-controller="PublicLightningNodeInfo"
-                                   asp-action="ShowLightningNodeInfo"
-                                   asp-route-cryptoCode="@scheme.CryptoCode"
-                                   asp-route-storeId="@Model.Id"
-                                   target="_blank">
-                                    Public Node Info
-                                </a>
                             </span>
                             <span class="d-flex align-items-center fw-semibold">
                                 <form method="post"