diff --git a/app/includes/csrf_middleware.php b/app/includes/csrf_middleware.php
index f55394c..c703ae6 100644
--- a/app/includes/csrf_middleware.php
+++ b/app/includes/csrf_middleware.php
@@ -3,7 +3,6 @@
 require_once __DIR__ . '/../helpers/security.php';
 
 function applyCsrfMiddleware() {
-    global $dbWeb, $logObject;
     $security = SecurityHelper::getInstance();
 
     // Skip CSRF check for GET requests
@@ -11,9 +10,10 @@ function applyCsrfMiddleware() {
         return true;
     }
 
-    // Skip CSRF check for initial login attempt
+    // Skip CSRF check for initial login and registration attempts
     if ($_SERVER['REQUEST_METHOD'] === 'POST' && 
-        isset($_GET['page']) && $_GET['page'] === 'login' && 
+        isset($_GET['page']) && 
+        in_array($_GET['page'], ['login', 'register']) && 
         !isset($_SESSION['username'])) {
         return true;
     }
@@ -29,7 +29,7 @@ function applyCsrfMiddleware() {
                 $_GET['page'] ?? 'unknown',
                 $_SESSION['username'] ?? 'anonymous'
             );
-            $logObject->insertLog(0, $logMessage);
+            $logObject->insertLog(0, $logMessage, 'system');
 
             // Return error message
             http_response_code(403);
diff --git a/public_html/index.php b/public_html/index.php
index ffe2007..0aae71e 100644
--- a/public_html/index.php
+++ b/public_html/index.php
@@ -24,14 +24,6 @@ require '../app/includes/sanitize.php';
 session_name('jilo');
 session_start();
 
-// Initialize security middleware
-require_once '../app/includes/csrf_middleware.php';
-require_once '../app/helpers/security.php';
-$security = SecurityHelper::getInstance();
-
-// Verify CSRF token for POST requests
-applyCsrfMiddleware();
-
 // Initialize feedback message system
 require_once '../app/classes/feedback.php';
 $system_messages = [];
@@ -137,6 +129,14 @@ include '../app/helpers/logs.php';
 $logObject = new Log($dbWeb);
 $user_IP = getUserIP();
 
+// Initialize security middleware
+require_once '../app/includes/csrf_middleware.php';
+require_once '../app/helpers/security.php';
+$security = SecurityHelper::getInstance();
+
+// Verify CSRF token for POST requests
+applyCsrfMiddleware();
+
 // init rate limiter
 require '../app/classes/ratelimiter.php';