diff --git a/gatehouse_app/api/v1/auth/core.py b/gatehouse_app/api/v1/auth/core.py
index e1d50c9..aa31b91 100644
--- a/gatehouse_app/api/v1/auth/core.py
+++ b/gatehouse_app/api/v1/auth/core.py
@@ -13,6 +13,7 @@ from gatehouse_app.services.email_templates import build_email_verification_html
 from gatehouse_app.utils.decorators import login_required
 from gatehouse_app.utils.constants import AuditAction
 from gatehouse_app.exceptions.auth_exceptions import InvalidCredentialsError
+from gatehouse_app.services.audit_service import AuditService
 
 
 @api_v1_bp.route("/auth/register", methods=["POST"])
@@ -130,8 +131,6 @@ def login():
             action=AuditAction.USER_LOGIN,
             user_id=user.id,
             organization_id=login_org_id,
-            ip_address=request.remote_addr,
-            user_agent=request.headers.get("User-Agent"),
             description="User logged in (password)",
             success=True,
         )
diff --git a/gatehouse_app/api/v1/auth/totp.py b/gatehouse_app/api/v1/auth/totp.py
index 8507173..c012efd 100644
--- a/gatehouse_app/api/v1/auth/totp.py
+++ b/gatehouse_app/api/v1/auth/totp.py
@@ -89,8 +89,6 @@ def verify_totp():
             action=AuditAction.USER_LOGIN,
             user_id=user.id,
             organization_id=login_org_id,
-            ip_address=request.remote_addr,
-            user_agent=request.headers.get("User-Agent"),
             description="User logged in (TOTP)",
             success=True,
         )
@@ -133,8 +131,6 @@ def verify_totp():
         AuditService.log_action(
             action=AuditAction.TOTP_VERIFY_FAILED,
             user_id=user.id,
-            ip_address=request.remote_addr,
-            user_agent=request.headers.get("User-Agent"),
             description="TOTP verification failed",
             success=False,
             error_message=e.message,
diff --git a/gatehouse_app/api/v1/auth/webauthn.py b/gatehouse_app/api/v1/auth/webauthn.py
index ef07693..55c74b3 100644
--- a/gatehouse_app/api/v1/auth/webauthn.py
+++ b/gatehouse_app/api/v1/auth/webauthn.py
@@ -138,8 +138,6 @@ def complete_webauthn_login():
             action=AuditAction.USER_LOGIN,
             user_id=user.id,
             organization_id=login_org_id,
-            ip_address=request.remote_addr,
-            user_agent=request.headers.get("User-Agent"),
             description="User logged in (WebAuthn)",
             success=True,
         )
@@ -181,8 +179,6 @@ def complete_webauthn_login():
         AuditService.log_action(
             action=AuditAction.WEBAUTHN_LOGIN_FAILED,
             user_id=user.id,
-            ip_address=request.remote_addr,
-            user_agent=request.headers.get("User-Agent"),
             description="WebAuthn login failed",
             success=False,
             error_message=e.message,
diff --git a/gatehouse_app/services/mfa_policy_service.py b/gatehouse_app/services/mfa_policy_service.py
index d7b1316..83e09d7 100644
--- a/gatehouse_app/services/mfa_policy_service.py
+++ b/gatehouse_app/services/mfa_policy_service.py
@@ -874,8 +874,6 @@ class MfaPolicyService:
             action=AuditAction.USER_LOGIN,
             user_id=user.id,
             organization_id=org_ids[0] if org_ids else None,
-            ip_address=ip_address,
-            user_agent=user_agent,
             description=f"Login attempt while compliance suspended. Suspended orgs: {org_ids}",
             success=False,
             error_message="MFA compliance required",
@@ -902,8 +900,6 @@ class MfaPolicyService:
         AuditService.log_action(
             action=AuditAction.USER_LOGIN,  # Reusing USER_LOGIN for audit
             user_id=user.id,
-            ip_address=ip_address,
-            user_agent=user_agent,
             resource_type="endpoint",
             resource_id=endpoint,
             description=f"Policy bypass attempt - compliance-only session accessed {endpoint}",