diff --git a/src/app/[lang]/signup/Signup.tsx b/src/app/[lang]/signup/Signup.tsx
index 18b0f78d..f7d59296 100644
--- a/src/app/[lang]/signup/Signup.tsx
+++ b/src/app/[lang]/signup/Signup.tsx
@@ -32,6 +32,16 @@ export default function SignUp(props: { d: Dictionary }): React.ReactElement {
 	const handleSignup = async () => {
 		setLoading(true);
 		setMessage(undefined);
+		if (email.endsWith("@gmail.com")) {
+			setMessage({
+				type: "error",
+				content:
+					"Gmail addresses are currently disabled due to spam abuse. Please use a company email.",
+			});
+			setLoading(false);
+			return;
+		}
+
 		const { error } = await supabase.auth.signUp({
 			email,
 			password,
diff --git a/src/app/api/v0/check_email/checkUserInDb.ts b/src/app/api/v0/check_email/checkUserInDb.ts
index 786aece5..a32aaa5a 100644
--- a/src/app/api/v0/check_email/checkUserInDb.ts
+++ b/src/app/api/v0/check_email/checkUserInDb.ts
@@ -78,11 +78,11 @@ export async function checkUserInDB(req: NextRequest): Promise<UserWithSub> {
 	const max = subApiMaxCalls(subAndCalls.product_id);
 	const rateLimitHeaders = getRateLimitHeaders(
 		new RateLimiterRes(
-			max - numberOfCalls - 1,
+			max - numberOfCalls - 1, // -1 because we just consumed 1 email.
 			msDiff,
 			numberOfCalls,
 			undefined
-		), // 1st arg has -1, because we just consumed 1 email.
+		),
 		max
 	);