diff --git a/src/backend/controllers/auth/AuthController.js b/src/backend/controllers/auth/AuthController.js
index dd0f8cd0e..0123f8752 100644
--- a/src/backend/controllers/auth/AuthController.js
+++ b/src/backend/controllers/auth/AuthController.js
@@ -373,7 +373,12 @@ export class AuthController extends PuterController {
                 const validateEvent = {
                     req,
                     data: body,
-                    ip: req.ip || req.socket?.remoteAddress || null,
+                    ip:
+                        req.headers?.['x-forwarded-for'] ||
+                        req.connection?.remoteAddress ||
+                        req.ip ||
+                        req.socket?.remoteAddress ||
+                        null,
                     email: body.email,
                     allow: true,
                     no_temp_user: false,
diff --git a/src/backend/services/auth/OIDCService.ts b/src/backend/services/auth/OIDCService.ts
index f9f7a8449..a78757099 100644
--- a/src/backend/services/auth/OIDCService.ts
+++ b/src/backend/services/auth/OIDCService.ts
@@ -322,6 +322,13 @@ export class OIDCService extends PuterService {
         const validateEvent = {
             req,
             data: { username, email: claims.email ?? '' },
+            ip:
+                (req?.headers?.['x-forwarded-for'] as string | undefined) ||
+                req?.connection?.remoteAddress ||
+                req?.ip ||
+                req?.socket?.remoteAddress ||
+                null,
+            email: claims.email ?? '',
             allow: true,
             no_temp_user: false,
             requires_email_confirmation: false,