diff --git a/lnbits/core/templates/admin/_tab_funding.html b/lnbits/core/templates/admin/_tab_funding.html
index 163b7420a..3aa011d14 100644
--- a/lnbits/core/templates/admin/_tab_funding.html
+++ b/lnbits/core/templates/admin/_tab_funding.html
@@ -85,64 +85,6 @@
           </div>
         </div>
       </div>
-      <h6 class="q-mt-xl q-mb-md">Service Fees</h6>
-      <div class="row q-col-gutter-md">
-        <div class="col-12 col-md-6">
-          <p>Service Fee</p>
-          <q-input
-            filled
-            type="number"
-            v-model.number="formData.lnbits_service_fee"
-            label="Service fee (%)"
-            step="0.1"
-            hint="Fee charged per tx (%)"
-          ></q-input>
-          <br />
-        </div>
-        <div class="col-12 col-md-6">
-          <p>Service fee max</p>
-          <q-input
-            filled
-            type="number"
-            v-model.number="formData.lnbits_service_fee_max"
-            label="Service fee max (sats)"
-            hint="Max service fee to charge in (sats)"
-          ></q-input>
-          <br />
-        </div>
-        <div class="col-12 col-md-6">
-          <p>Fee Wallet</p>
-          <q-input
-            filled
-            v-model="formData.lnbits_service_fee_wallet"
-            label="Fee wallet (wallet ID)"
-            hint="Wallet ID to send funds to"
-          ></q-input>
-          <br />
-        </div>
-        <div class="col-12 col-md-6">
-          <p>Disable Service Fee for Internal Payments</p>
-          <q-item tag="label" v-ripple>
-            <q-item-section>
-              <q-item-label>Disable Fee</q-item-label>
-              <q-item-label caption
-                >Disable Service Fee for Internal Lightning
-                Payments</q-item-label
-              >
-            </q-item-section>
-            <q-item-section avatar>
-              <q-toggle
-                size="md"
-                v-model="formData.lnbits_service_fee_ignore_internal"
-                checked-icon="check"
-                color="green"
-                unchecked-icon="clear"
-              />
-            </q-item-section>
-          </q-item>
-          <br />
-        </div>
-      </div>
       <div v-if="isSuperUser">
         <lnbits-funding-sources
           :form-data="formData"
diff --git a/lnbits/core/templates/admin/_tab_security.html b/lnbits/core/templates/admin/_tab_security.html
index 0b62f1ae0..626253ebb 100644
--- a/lnbits/core/templates/admin/_tab_security.html
+++ b/lnbits/core/templates/admin/_tab_security.html
@@ -1,7 +1,87 @@
 <q-tab-panel name="security">
   <q-card-section class="q-pa-none">
-    <h6 class="q-my-none" v-text="$t('security_tools')"></h6>
+    <h6 class="q-my-none q-mb-sm">Authentication</h6>
+    <div class="row">
+      <div class="col-md-6 col-sm-12 q-pr-sm">
+        <q-input
+          filled
+          v-model="formData.auth_token_expire_minutes"
+          type="number"
+          label="Token expire minutes"
+          hint="Time in minutes until the token expires"
+        >
+        </q-input>
+      </div>
+      <div class="col-md-6 col-sm-12 q-pr-sm">
+        <q-select
+          filled
+          v-model="formData.auth_allowed_methods"
+          multiple
+          hint="Allowed authorization methods"
+          label="Select authorization methods"
+          :options="formData.auth_all_methods"
+        ></q-select>
+      </div>
+    </div>
+  </q-card-section>
+  <q-card-section
+    v-if="formData.auth_allowed_methods?.includes('google-auth')"
+    class="q-pl-xl"
+  >
+    <strong class="q-my-none q-mb-sm">Google Auth</strong>
+
+    <div class="row">
+      <div class="col-md-6 col-sm-12 q-pr-sm">
+        <q-input
+          filled
+          v-model="formData.google_client_id"
+          label="Google Client ID"
+          hint="Make sure thant the authorized redirect URIs contain https://{domain}/api/v1/auth/google/token"
+        >
+        </q-input>
+      </div>
+      <div class="col-md-6 col-sm-12">
+        <q-input
+          filled
+          v-model="formData.google_client_secret"
+          type="password"
+          label="Google Client Secret"
+        >
+        </q-input>
+      </div>
+    </div>
+  </q-card-section>
+  <q-card-section
+    v-if="formData.auth_allowed_methods?.includes('github-auth')"
+    class="q-pl-xl"
+  >
+    <strong class="q-my-none q-mb-sm">GitHub Auth</strong>
+
+    <div class="row">
+      <div class="col-md-6 col-sm-12 q-pr-sm">
+        <q-input
+          filled
+          v-model="formData.github_client_id"
+          label="GitHub Client ID"
+          hint="Make sure thant the authorization callback URL is set to https://{domain}/api/v1/auth/github/token"
+        >
+        </q-input>
+      </div>
+      <div class="col-md-6 col-sm-12">
+        <q-input
+          filled
+          v-model="formData.github_client_secret"
+          type="password"
+          label="GitHub Client Secret"
+        >
+        </q-input>
+      </div>
+    </div>
+  </q-card-section>
+  <q-separator></q-separator>
+  <q-card-section class="q-pa-none">
     <br />
+    <h6 class="q-my-none" v-text="$t('security_tools')"></h6>
     <div>
       <div class="row">
         <div v-if="serverlogEnabled" class="column" style="width: 100%">
diff --git a/lnbits/core/templates/admin/_tab_server.html b/lnbits/core/templates/admin/_tab_server.html
index e67b23391..375d5120c 100644
--- a/lnbits/core/templates/admin/_tab_server.html
+++ b/lnbits/core/templates/admin/_tab_server.html
@@ -80,7 +80,67 @@
           <br />
         </div>
       </div>
+      <br />
+      <h6 class="q-my-none">Service Fee</h6>
+      <div class="row q-col-gutter-md">
+        <div class="col-12 col-md-6">
+          <p>Service Fee</p>
+          <q-input
+            filled
+            type="number"
+            v-model.number="formData.lnbits_service_fee"
+            label="Service fee (%)"
+            step="0.1"
+            hint="Fee charged per tx (%)"
+          ></q-input>
+          <br />
+        </div>
+        <div class="col-12 col-md-6">
+          <p>Service fee max</p>
+          <q-input
+            filled
+            type="number"
+            v-model.number="formData.lnbits_service_fee_max"
+            label="Service fee max (sats)"
+            hint="Max service fee to charge in (sats)"
+          ></q-input>
+          <br />
+        </div>
+        <div class="col-12 col-md-6">
+          <p>Fee Wallet</p>
+          <q-input
+            filled
+            v-model="formData.lnbits_service_fee_wallet"
+            label="Fee wallet (wallet ID)"
+            hint="Wallet ID to send funds to"
+          ></q-input>
+          <br />
+        </div>
+        <div class="col-12 col-md-6">
+          <p>Disable Service Fee for Internal Payments</p>
+          <q-item tag="label" v-ripple>
+            <q-item-section>
+              <q-item-label>Disable Fee</q-item-label>
+              <q-item-label caption
+                >Disable Service Fee for Internal Lightning
+                Payments</q-item-label
+              >
+            </q-item-section>
+            <q-item-section avatar>
+              <q-toggle
+                size="md"
+                v-model="formData.lnbits_service_fee_ignore_internal"
+                checked-icon="check"
+                color="green"
+                unchecked-icon="clear"
+              />
+            </q-item-section>
+          </q-item>
+          <br />
+        </div>
+      </div>
 
+      <h6 class="q-my-none">Extensions</h6>
       <div>
         <p>Extension Sources</p>
         <q-input
diff --git a/lnbits/core/templates/admin/_tab_users.html b/lnbits/core/templates/admin/_tab_users.html
index 65f4067fc..a25f493bf 100644
--- a/lnbits/core/templates/admin/_tab_users.html
+++ b/lnbits/core/templates/admin/_tab_users.html
@@ -61,85 +61,4 @@
       </div>
     </div>
   </q-card-section>
-  <q-separator></q-separator>
-  <q-card-section class="q-pa-none">
-    <h6 class="q-my-none q-mb-sm">Authentication</h6>
-
-    <div class="row">
-      <div class="col-md-6 col-sm-12 q-pr-sm">
-        <q-input
-          filled
-          v-model="formData.auth_token_expire_minutes"
-          type="number"
-          label="Token expire minutes"
-          hint="Time in minutes until the token expires"
-        >
-        </q-input>
-      </div>
-      <div class="col-md-6 col-sm-12 q-pr-sm">
-        <q-select
-          filled
-          v-model="formData.auth_allowed_methods"
-          multiple
-          hint="Allowed authorization methods"
-          label="Select authorization methods"
-          :options="formData.auth_all_methods"
-        ></q-select>
-      </div>
-    </div>
-  </q-card-section>
-  <q-card-section
-    v-if="formData.auth_allowed_methods?.includes('google-auth')"
-    class="q-pl-xl"
-  >
-    <strong class="q-my-none q-mb-sm">Google Auth</strong>
-
-    <div class="row">
-      <div class="col-md-6 col-sm-12 q-pr-sm">
-        <q-input
-          filled
-          v-model="formData.google_client_id"
-          label="Google Client ID"
-          hint="Make sure thant the authorized redirect URIs contain https://{domain}/api/v1/auth/google/token"
-        >
-        </q-input>
-      </div>
-      <div class="col-md-6 col-sm-12">
-        <q-input
-          filled
-          v-model="formData.google_client_secret"
-          type="password"
-          label="Google Client Secret"
-        >
-        </q-input>
-      </div>
-    </div>
-  </q-card-section>
-  <q-card-section
-    v-if="formData.auth_allowed_methods?.includes('github-auth')"
-    class="q-pl-xl"
-  >
-    <strong class="q-my-none q-mb-sm">GitHub Auth</strong>
-
-    <div class="row">
-      <div class="col-md-6 col-sm-12 q-pr-sm">
-        <q-input
-          filled
-          v-model="formData.github_client_id"
-          label="GitHub Client ID"
-          hint="Make sure thant the authorization callback URL is set to https://{domain}/api/v1/auth/github/token"
-        >
-        </q-input>
-      </div>
-      <div class="col-md-6 col-sm-12">
-        <q-input
-          filled
-          v-model="formData.github_client_secret"
-          type="password"
-          label="GitHub Client Secret"
-        >
-        </q-input>
-      </div>
-    </div>
-  </q-card-section>
 </q-tab-panel>