diff --git a/src/Admin/Views/Organizations/Edit.cshtml b/src/Admin/Views/Organizations/Edit.cshtml
index 400eb52904..87a8a5fff3 100644
--- a/src/Admin/Views/Organizations/Edit.cshtml
+++ b/src/Admin/Views/Organizations/Edit.cshtml
@@ -421,6 +421,14 @@
         </div>
     </div>
     <h2>Features</h2>
+    <div class="form-check">
+        <input type="checkbox" class="form-check-input" asp-for="UseTotp">
+        <label class="form-check-label" asp-for="UseTotp"></label>
+    </div>
+    <div class="form-check mb-2">
+        <input type="checkbox" class="form-check-input" asp-for="SelfHost">
+        <label class="form-check-label" asp-for="SelfHost"></label>
+    </div>
     <div class="form-check">
         <input type="checkbox" class="form-check-input" asp-for="UseGroups">
         <label class="form-check-label" asp-for="UseGroups"></label>
@@ -433,14 +441,6 @@
         <input type="checkbox" class="form-check-input" asp-for="UseEvents">
         <label class="form-check-label" asp-for="UseEvents"></label>
     </div>
-    <div class="form-check">
-        <input type="checkbox" class="form-check-input" asp-for="UseTotp">
-        <label class="form-check-label" asp-for="UseTotp"></label>
-    </div>
-    <div class="form-check">
-        <input type="checkbox" class="form-check-input" asp-for="SelfHost">
-        <label class="form-check-label" asp-for="SelfHost"></label>
-    </div>
     <div class="form-check">
         <input type="checkbox" class="form-check-input" asp-for="UsersGetPremium">
         <label class="form-check-label" asp-for="UsersGetPremium"></label>