diff --git a/pages/auth/login/+Page.vue b/pages/auth/login/+Page.vue
index 614fbef..a0a4d3d 100644
--- a/pages/auth/login/+Page.vue
+++ b/pages/auth/login/+Page.vue
@@ -70,7 +70,10 @@
 				</div>
 			</div>
 
-			<button class="button button-submit">Log in</button>
+			<button
+				class="button button-submit"
+				:disabled="submitted"
+			>Log in</button>
 
 			<a
 				v-if="allowSignup"
@@ -94,11 +97,13 @@ const allowSignup = pageContext.env.allowSignup;
 const username = ref('');
 const password = ref('');
 
+const submitted = ref(false);
 const errorMsg = ref(null);
 const userInput = ref(null);
 const showPassword = ref(false);
 
 async function login() {
+	submitted.value = true;
 	errorMsg.value = null;
 
 	try {
@@ -111,6 +116,8 @@ async function login() {
 		navigate(pageContext.urlParsed.search.r ? decodeURIComponent(pageContext.urlParsed.search.r) : `/user/${loginUser.username}`, null, { redirect: true });
 	} catch (error) {
 		errorMsg.value = error.message;
+	} finally {
+		submitted.value = true;
 	}
 }
 
diff --git a/pages/auth/signup/+Page.vue b/pages/auth/signup/+Page.vue
index edd4731..23f7c3f 100644
--- a/pages/auth/signup/+Page.vue
+++ b/pages/auth/signup/+Page.vue
@@ -120,7 +120,10 @@
 				@expired="captcha = null"
 			/>
 
-			<button class="button button-submit">Sign up</button>
+			<button
+				class="button button-submit"
+				:disabled="submitted"
+			>Sign up</button>
 
 			<a
 				href="/login"
@@ -146,24 +149,24 @@ const password = ref('');
 const passwordConfirm = ref('');
 
 const errorMsg = ref(null);
+const submitted = ref(false);
 const userInput = ref(null);
 const showPassword = ref(false);
 const captcha = ref(null);
 
 async function signup() {
 	errorMsg.value = null;
+	submitted.value = true;
 
 	if (password.value !== passwordConfirm.value) {
 		errorMsg.value = 'Passwords do not match';
 		return;
 	}
 
-	/*
 	if (env.captcha.enabled && !captcha.value) {
 		errorMsg.value = 'Please complete the CAPTCHA';
 		return;
 	}
-	 */
 
 	try {
 		const newUser = await post('/users', {
@@ -177,6 +180,8 @@ async function signup() {
 		navigate(`/user/${newUser.username}`, null, { redirect: true });
 	} catch (error) {
 		errorMsg.value = error.message;
+	} finally {
+		submitted.value = true;
 	}
 }