diff --git a/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml b/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
index 6c712e2b1..939466f6b 100644
--- a/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
+++ b/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
@@ -16,7 +16,7 @@
 <div class="row">
     <div class="col-md-8">
         <form method="post">
-            @if (!Model.Confirmation)
+            @if(!Model.Confirmation)
             {
                 <div class="form-group">
                     <h5>Derivation Scheme</h5>
@@ -33,7 +33,7 @@
                     <div id="ledger-info" class="form-text text-muted" style="display: none;">
                         <span>A ledger wallet is detected, which account do you want to use?</span>
                         <ul>
-                            @for (int i = 0; i < 4; i++)
+                            @for(int i = 0; i < 4; i++)
                             {
                                 <li><a class="ledger-info-recommended" data-ledgeraccount="@i" href="#">Account @i (<span>@Model.RootKeyPath.Derive(i, true)</span>)</a></li>
                             }
@@ -77,10 +77,9 @@
                         </tbody>
                     </table>
                 </div>
-                <div class="form-check">
-                    <input id="enabled" asp-for="Enabled" class="form-check-input" />
-                    <label asp-for="Enabled" class="form-check-label"></label>
-                    <span asp-validation-for="Enabled" class="text-danger"></span>
+                <div class="form-group">
+                    <label asp-for="Enabled"></label>
+                    <input asp-for="Enabled" type="checkbox" class="form-check" />
                 </div>
                 <button name="command" type="submit" class="btn btn-primary" value="save">Continue</button>
             }
@@ -102,7 +101,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                            @foreach (var sample in Model.AddressSamples)
+                            @foreach(var sample in Model.AddressSamples)
                             {
                                 <tr>
                                     <td>@sample.KeyPath</td>
diff --git a/BTCPayServer/Views/Stores/AddLightningNode.cshtml b/BTCPayServer/Views/Stores/AddLightningNode.cshtml
index f303dbc09..25673d172 100644
--- a/BTCPayServer/Views/Stores/AddLightningNode.cshtml
+++ b/BTCPayServer/Views/Stores/AddLightningNode.cshtml
@@ -55,17 +55,16 @@
                 <label asp-for="ConnectionString"></label>
                 <input id="lightningurl" asp-for="ConnectionString" class="form-control" />
                 <span asp-validation-for="ConnectionString" class="text-danger"></span>
-                @if (Model.InternalLightningNode != null)
+                @if(Model.InternalLightningNode != null)
                 {
                     <p class="form-text text-muted">
                         You can use the internal lightning node by <a href="#" onclick="$('#lightningurl').val('@Model.InternalLightningNode'); return false;">clicking here</a>
                     </p>
                 }
             </div>
-            <div class="form-check">
-                <input id="enabled" asp-for="Enabled" class="form-check-input" />
-                <label asp-for="Enabled" class="form-check-label"></label>
-                <span asp-validation-for="Enabled" class="text-danger"></span>
+            <div class="form-group">
+                <label asp-for="Enabled"></label>
+                <input asp-for="Enabled" type="checkbox" class="form-check" />
             </div>
             <button name="command" type="submit" value="save" class="btn btn-primary">Submit</button>
             <button name="command" type="submit" value="test" class="btn btn-secondary">Test connection</button>
diff --git a/BTCPayServer/Views/Stores/UpdateStore.cshtml b/BTCPayServer/Views/Stores/UpdateStore.cshtml
index 91b39c1f2..2218887f4 100644
--- a/BTCPayServer/Views/Stores/UpdateStore.cshtml
+++ b/BTCPayServer/Views/Stores/UpdateStore.cshtml
@@ -70,7 +70,7 @@
                         <tr>
                             <th>Crypto</th>
                             <th>Derivation Scheme</th>
-                            <th>Status</th>
+                            <th>Enabled</th>
                             <th style="text-align:right">Actions</th>
                         </tr>
                     </thead>
@@ -81,10 +81,7 @@
                                 <td>@scheme.Crypto</td>
                                 <td style="max-width:300px;overflow:hidden;">@scheme.Value</td>
                                 <td>
-                                    @if (!string.IsNullOrWhiteSpace(scheme.Value))
-                                    {
-                                        @(scheme.Enabled ? "Enabled" : "Disabled")
-                                    }
+                                        @(scheme.Enabled ? "Yes" : "No")
                                 </td>
                                 <td style="text-align:right">
                                     @if(!string.IsNullOrWhiteSpace(scheme.Value))
@@ -113,7 +110,7 @@
                             <tr>
                                 <th>Crypto</th>
                                 <th>Address</th>
-                                <th>Status</th>
+                                <th>Enabled</th>
                                 <th style="text-align:right">Actions</th>
                             </tr>
                         </thead>
@@ -124,7 +121,7 @@
                                     <td>@scheme.CryptoCode</td>
                                     <td>@scheme.Address</td>
                                     <td>
-                                        @(scheme.Enabled ? "Enabled" : "Disabled")
+                                        @(scheme.Enabled ? "Yes" : "No")
                                     </td>
                                     <td style="text-align:right"><a asp-action="AddLightningNode" asp-route-cryptoCode="@scheme.CryptoCode">Modify</a></td>
                                 </tr>