diff --git a/src/api/index.js b/src/api/index.js
index 4d7e1cb..8bc340e 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -43,8 +43,7 @@ export const systemApi = {
     },
     setSettings: (settings) => 
         api.post('/system/settings/set', settings),
-    testWebhook: (webhookConfig) => 
-        api.post('/system/webhook/test', webhookConfig)
+    restartServer: () => api.get('/system/restart')
 };
 
 export const authApi = {
diff --git a/src/components/TopBar.vue b/src/components/TopBar.vue
index 6511304..5119e19 100644
--- a/src/components/TopBar.vue
+++ b/src/components/TopBar.vue
@@ -75,8 +75,9 @@
 
 <script>
 import { ref, onMounted, onBeforeUnmount } from 'vue';
-import { systemApi, authApi, userApi } from '../api/index.js';
-import { getCookie, setCookie, deleteCookie as removeCookie, showNotification } from '../utils/functions.js';
+import { systemApi, userApi } from '../api/index.js';
+import { getCookie, setCookie, showNotification } from '../utils/functions.js';
+import { handleLogout as performLogout } from '../utils/session.js';
 import { useRouter } from 'vue-router';
 
 export default {
@@ -174,16 +175,7 @@ export default {
 
         const handleLogout = async () => {
             menuVisible.value = false;
-            try {
-                await authApi.logout();
-            } catch (error) {
-                console.error('Logout API error:', error);
-            }
-            removeCookie('token');
-            removeCookie('username');
-            removeCookie('user-type');
-            removeCookie('user-id');
-            router.push('/login');
+            await performLogout(router);
         };
 
         const closeMenu = (event) => {
diff --git a/src/utils/session.js b/src/utils/session.js
new file mode 100644
index 0000000..c6ffb6f
--- /dev/null
+++ b/src/utils/session.js
@@ -0,0 +1,23 @@
+import { authApi } from '../api/index.js';
+import { deleteCookie as removeCookie } from './functions.js';
+
+async function handleLogout(router) {
+    try {
+        await authApi.logout();
+    } catch (error) {
+        console.error('Logout API error:', error);
+    }
+
+    removeCookie('token');
+    removeCookie('username');
+    removeCookie('user-type');
+    removeCookie('user-id');
+
+    if (router) {
+        router.push('/login');
+    }
+}
+
+export {
+    handleLogout
+};
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index fdc5f99..c0974ff 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -81,7 +81,7 @@
 
         <div class="form-actions save-actions">
             <button @click="saveSettings" class="submit-btn" :disabled="isSaving">
-                {{ isSaving ? 'Saving...' : 'Save Settings' }}
+                {{ isSaving ? 'Saving...' : 'Save Settings and Restart' }}
             </button>
         </div>
 
@@ -122,14 +122,17 @@
 
 <script>
 import { ref, reactive, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
 import { systemApi } from '../api/index.js';
 import { showNotification } from '../utils/functions.js';
+import { handleLogout as performLogout } from '../utils/session.js';
 
 export default {
     name: 'Settings',
     setup() {
         const isSaving = ref(false);
         const showWebhookDialog = ref(false);
+        const router = useRouter();
 
         const settings = reactive({
             listenAddr: '',
@@ -188,6 +191,8 @@ export default {
                 const result = await systemApi.setSettings(payload);
                 if (result.success) {
                     alert('Settings saved successfully');
+                    systemApi.restartServer();
+                    await performLogout(router);
                 } else {
                     alert(result.message || 'Failed to save settings');
                 }