diff --git a/apps/login/.env.integration b/apps/login/.env.integration
index 03bff984d9..90adb84eee 100644
--- a/apps/login/.env.integration
+++ b/apps/login/.env.integration
@@ -1,3 +1,3 @@
 ZITADEL_API_URL=http://localhost:22222
-CACHE_REVALIDATION_INTERVAL_IN_SECONDS=3600
+EMAIL_VERIFICATION=true
 DEBUG=true
\ No newline at end of file
diff --git a/apps/login/src/lib/server/password.ts b/apps/login/src/lib/server/password.ts
index d16692a4d6..cbe9660fd7 100644
--- a/apps/login/src/lib/server/password.ts
+++ b/apps/login/src/lib/server/password.ts
@@ -175,9 +175,11 @@ export async function sendPassword(command: UpdateSessionCommand) {
     return { error: "Initial User not supported" };
   }
 
-  // TODO add check to see if user was verified
-
-  if (!humanUser?.email?.isVerified) {
+  // add check to see if user was verified
+  if (
+    !humanUser?.email?.isVerified &&
+    process.env.EMAIL_VERIFICATION === "true"
+  ) {
     const params = new URLSearchParams({
       loginName: session.factors?.user?.loginName as string,
     });
diff --git a/turbo.json b/turbo.json
index a98ff8726d..2817c8c157 100644
--- a/turbo.json
+++ b/turbo.json
@@ -12,7 +12,7 @@
     "ZITADEL_SYSTEM_API_KEY",
     "ZITADEL_ISSUER",
     "ZITADEL_ADMIN_TOKEN",
-    "CACHE_REVALIDATION_INTERVAL_IN_SECONDS",
+    "EMAIL_VERIFICATION",
     "VERCEL_URL"
   ],
   "tasks": {