diff --git a/public/index.php b/public/index.php
index 975bc8b..1f6bcbb 100644
--- a/public/index.php
+++ b/public/index.php
@@ -77,13 +77,19 @@ $app->router->group([
         // Settings
         $r->get('/settings', [SettingsController::class, 'index']);
         $r->post('/settings/save', [SettingsController::class, 'save']);
-
-        // Language switch (no CSRF needed for GET)
-        $r->get('/lang/{lang}', [SettingsController::class, 'switchLang']);
+        $r->post('/settings/test-telegram', [SettingsController::class, 'testTelegram']);
     });
 
     // Logout endpoint
     $router->get('/logout', [AuthController::class, 'logout']);
+
+    // Language switch (no middleware needed for GET, but needs session)
+    $router->group([
+        'prefix' => '/admin',
+        'middleware' => [Authenticate::class]
+    ], function($r) {
+        $r->get('/lang/{lang}', [SettingsController::class, 'switchLang']);
+    });
 });
 
 // API Routes (no CSRF, uses JWT)
diff --git a/resources/views/admin/settings/index.php b/resources/views/admin/settings/index.php
index 435a00c..945988a 100644
--- a/resources/views/admin/settings/index.php
+++ b/resources/views/admin/settings/index.php
@@ -31,11 +31,17 @@
                 <label class="form-label" style="margin: 0;"><?= $t['telegram_enabled'] ?? 'Enable' ?></label>
                 <input type="checkbox" name="telegram_enabled" value="1" <?= $tg_enabled === '1' ? 'checked' : '' ?> style="width: 20px; height: 20px;">
             </div>
-            <div style="display: flex; gap: 12px; margin-top: 16px;">
+            <div style="display: flex; gap: 12px; margin-top: 16px; flex-wrap: wrap;">
                 <button type="submit" name="action" value="save" class="btn btn-primary"><?= $t['save'] ?? 'Save' ?></button>
-                <button type="submit" name="action" value="test" class="btn btn-secondary"><?= $t['test_notification'] ?? 'Send Test' ?></button>
             </div>
         </form>
+
+        <form action="/admin/settings/test-telegram" method="POST" style="margin-top: 12px;">
+            <input type="hidden" name="_csrf" value="<?= $this->session->getCsrfToken() ?>">
+            <input type="hidden" name="telegram_bot_token" value="<?= $this->escape($tg_token) ?>">
+            <input type="hidden" name="telegram_chat_id" value="<?= $this->escape($tg_chat_id) ?>">
+            <button type="submit" class="btn btn-secondary"><?= $t['test_notification'] ?? 'Send Test' ?></button>
+        </form>
     </div>
 
     <!-- Help Info -->