diff --git a/src/actions/init-session.ts b/src/actions/init-session.ts
index 49a3b8dd..5526cca0 100644
--- a/src/actions/init-session.ts
+++ b/src/actions/init-session.ts
@@ -1,21 +1,40 @@
-import { app } from "@/firebase/server";
+import { app } from "@/lib/firebase/server";
 import { defineAction } from "astro:actions";
 import { getAuth } from "firebase-admin/auth";
 import { z } from "astro:schema";
-import { initUserSubmission } from "@/firebase/database";
+import { initUserSubmission } from "@/lib/firebase/database";
+import { isCaptchaValid } from "@/lib/captcha";
 
 export const initSession = defineAction({
   accept: "json",
   input: z.object({
-    idToken: z.string()
+    idToken: z.string(),
+    captchaToken: z.string().optional()
   }),
-  handler: async ({ idToken }, { cookies }) => {
+  handler: async ({ idToken, captchaToken }, { cookies }) => {
     const auth = getAuth(app);
+    /* Validate inputs */
+    if (!captchaToken && import.meta.env.CAPTCHA_ENABLED === "true") {
+      return {
+        error: "Captcha token is required"
+      };
+    }
     if (!idToken) {
       return {
         error: "No idToken provided"
       };
     }
+
+    /* Validate captcha */
+    if (captchaToken && import.meta.env.CAPTCHA_ENABLED === "true") {
+      const isValid = await isCaptchaValid(captchaToken);
+      if (!isValid) {
+        return {
+          error: "Invalid captcha"
+        };
+      }
+    }
+
     /* Verify id token and save user to database */
     try {
       const decodedToken = await auth.verifyIdToken(idToken);
diff --git a/src/actions/submit-answers.ts b/src/actions/submit-answers.ts
index b3786683..f98c0348 100644
--- a/src/actions/submit-answers.ts
+++ b/src/actions/submit-answers.ts
@@ -1,8 +1,8 @@
-import { app } from "@/firebase/server";
+import { app } from "@/lib/firebase/server";
 import { defineAction } from "astro:actions";
 import { getAuth } from "firebase-admin/auth";
 import { z } from "astro:schema";
-import { saveAnswers } from "@/firebase/database";
+import { saveAnswers } from "@/lib/firebase/database";
 
 export const submitAnswers = defineAction({
   accept: "json",
diff --git a/src/components/survey/section.tsx b/src/components/survey/section.tsx
index 0ff05781..f0a5c0ff 100644
--- a/src/components/survey/section.tsx
+++ b/src/components/survey/section.tsx
@@ -19,7 +19,6 @@ export const ERRORS = {
 const convertAnswersToNumber = (
   answers: Record<string, string | string[] | null | boolean>
 ) => {
-  console.log(answers);
   const convertedAnswers: Record<string, number | number[] | null> = {};
 
   for (const [key, value] of Object.entries(answers)) {
@@ -131,7 +130,7 @@ export default React.memo(({ section, next, setProgress }: SectionProps) => {
           <button
             data-testid="next-button"
             type="button"
-            className="px-4 py-2 bg-emerald-500 text-white rounded transition hover:bg-emerald-600"
+            className="px-4 py-2 min-w-[120px] bg-emerald-500 text-white rounded transition hover:bg-emerald-600"
             onClick={() => nextQuestion()}
           >
             {loading ? "Loading..." : "Next"}
diff --git a/src/lib/captcha.ts b/src/lib/captcha.ts
new file mode 100644
index 00000000..2cc08538
--- /dev/null
+++ b/src/lib/captcha.ts
@@ -0,0 +1,25 @@
+const CLOUDFLARE_CAPTCHA_URL =
+  "https://challenges.cloudflare.com/turnstile/v0/siteverify";
+
+export const isCaptchaValid = async (token: string) => {
+  if (import.meta.env.CAPTCHA_ENABLED === "false") return true;
+  if (!import.meta.env.PUBLIC_TURNSTILE_SECRET_KEY) return true;
+  try {
+    const response = await fetch(CLOUDFLARE_CAPTCHA_URL, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded"
+      },
+      body: JSON.stringify({
+        secret: import.meta.env.PUBLIC_TURNSTILE_SECRET_KEY,
+        response: token
+      })
+    });
+
+    const data = await response.json();
+    return data.success;
+  } catch (error) {
+    console.error("Error validating captcha:", error);
+    return false;
+  }
+};
diff --git a/src/firebase/client.ts b/src/lib/firebase/client.ts
similarity index 100%
rename from src/firebase/client.ts
rename to src/lib/firebase/client.ts
diff --git a/src/firebase/database.ts b/src/lib/firebase/database.ts
similarity index 100%
rename from src/firebase/database.ts
rename to src/lib/firebase/database.ts
diff --git a/src/firebase/server.ts b/src/lib/firebase/server.ts
similarity index 100%
rename from src/firebase/server.ts
rename to src/lib/firebase/server.ts