diff --git a/src/components/Form/PdapForm.vue b/src/components/Form/PdapForm.vue
index 4771ff4..647e02c 100644
--- a/src/components/Form/PdapForm.vue
+++ b/src/components/Form/PdapForm.vue
@@ -1,11 +1,5 @@
 <template>
-	<form
-		:id="id"
-		:name="name"
-		class="pdap-form"
-		@change="change"
-		@submit.prevent="submit($event)"
-	>
+	<form :id="id" :name="name" class="pdap-form" @submit.prevent="submit">
 		<div
 			v-if="typeof errorMessage === 'string'"
 			class="pdap-form-error-message"
@@ -23,7 +17,7 @@
 					: ''
 			"
 			:value="values[field.name]"
-			@change="updateForm(field.name, $event)"
+			@input="updateForm(field, $event)"
 		/>
 		<slot />
 	</form>
@@ -42,11 +36,12 @@ import { createRule } from '../../utils/vuelidate';
 
 // Types
 import { PdapFormProps } from './types';
-import { PdapInputTypes } from '../Input/types';
+import { PdapInputProps, PdapInputTypes } from '../Input/types';
 
 // Props
 const props = withDefaults(defineProps<PdapFormProps>(), {
 	error: null,
+	resetOn: 'submit',
 });
 
 // Emits
@@ -97,16 +92,20 @@ const v$ = useVuelidate(rules, values, { $autoDirty: false, $lazy: true });
 const errorMessage = ref(props.error);
 
 // Handlers
-function updateForm(fieldName: string, event: Event) {
+function updateForm(field: PdapInputProps, event: Event) {
 	const target = event.target as HTMLInputElement;
-	const update =
-		target.type === PdapInputTypes.CHECKBOX &&
-		typeof target.checked === 'boolean'
-			? target.checked.toString()
-			: target.value;
 
-	values.value[fieldName] = update;
-	change();
+	const update = (() => {
+		switch (field.type) {
+			case PdapInputTypes.CHECKBOX:
+				return target.checked ? 'true' : 'false';
+			default:
+				return target.value;
+		}
+	})();
+
+	values.value[field.name] = update;
+	emit('change', values.value);
 }
 
 // Effects
@@ -119,43 +118,32 @@ watchEffect(() => {
 		errorMessage.value = 'Please update this form to correct the errors';
 });
 
-// Effect - Debug logger - following comment ignores in coverage report
-/* c8 ignore next 12 */
 watchEffect(() => {
-	if (import.meta.env.MODE === 'development') {
-		console.debug(`PdapForm ${props.name}\n`, {
-			errorMessage: errorMessage.value,
-			props,
-			values,
-			vuelidate: {
-				rules,
-				v$,
-			},
-		});
+	if (props.resetOn && props.resetOn !== 'submit') {
+		resetForm();
 	}
 });
 
-function change() {
-	emit('change', { ...values.value });
+/**
+ * Reset vuelidate and wipe values state
+ */
+function resetForm() {
+	v$.value.$reset();
+	values.value = Object.entries(values).reduce((acc, [key]) => {
+		return { ...acc, [key]: '' };
+	}, {});
 }
 
-async function submit(event: Event) {
+async function submit() {
 	// Check form submission
 	const isValidSubmission = await v$.value.$validate();
 	if (isValidSubmission) {
 		// Emit submit event (spread to new object to create new object, this allows us to reset `values` without messing with the data returned)
 		emit('submit', { ...values.value });
-		// Reset vuelidate and form
-		v$.value.$reset();
-		const form = <HTMLFormElement>event.target;
-		form.reset();
 
-		// Wipe values state
-		values.value = Object.entries(values).reduce((acc, [key]) => {
-			return { ...acc, [key]: '' };
-		}, {});
-
-		return;
+		if (props.resetOn === 'submit') {
+			resetForm();
+		}
 	}
 }
 </script>
diff --git a/src/components/Form/README.md b/src/components/Form/README.md
index 6fb85d8..4eab8e4 100644
--- a/src/components/Form/README.md
+++ b/src/components/Form/README.md
@@ -4,12 +4,13 @@ The `Form` component is powerful. All you need to do is pass a few props, and th
 
 ## Props
 
-| name     | required? | types                                                    | description                        | default     |
-| -------- | --------- | -------------------------------------------------------- | ---------------------------------- | ----------- |
-| `error`  | no        | `string` \| `undefined` \| `null`                        | Error state                        | `undefined` |
-| `id`     | yes       | `string`                                                 | Form id                            | none        |
-| `name`   | yes       | `string`                                                 | Form name                          | none        |
-| `schema` | yes       | `PdapFormSchema` (array of `PdapFormInputProps` objects) | Array of schema entries for inputs | none        |
+| name      | required? | types                                                    | description                                                                                                                    | default     |
+| --------- | --------- | -------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ | ----------- |
+| `error`   | no        | `string` \| `undefined` \| `null`                        | Error state                                                                                                                    | `undefined` |
+| `id`      | yes       | `string`                                                 | Form id                                                                                                                        | none        |
+| `name`    | yes       | `string`                                                 | Form name                                                                                                                      | none        |
+| `schema`  | yes       | `PdapFormSchema` (array of `PdapFormInputProps` objects) | Array of schema entries for inputs                                                                                             | none        |
+| `resetOn` | no        | `'submit'` \| `boolean`                                  | When to reset form - if `'submit'`, it happens during submission. If `boolean`, it happens on any change of the prop to `true` | `'submit'`  |
 
 
 
@@ -71,6 +72,8 @@ PdapFormValidators {
 
 ## Example
 
+Note: to observe `resetOn`, see the [demo page](../../demo/pages/SignupFormDemo.vue)
+
 ```
 <template>
   <Form :schema="formSchema" :on-submit="handleSubmit" id="test-form" name="data-request-form">
diff --git a/src/components/Form/form.spec.ts b/src/components/Form/form.spec.ts
index 9c768ee..19f15cc 100644
--- a/src/components/Form/form.spec.ts
+++ b/src/components/Form/form.spec.ts
@@ -200,8 +200,8 @@ describe('Form component', () => {
 		await inputTextTwo.setValue('bar');
 		await inputEmail.setValue('hello@hello.com');
 		await inputPassword.setValue('P@ssword1!');
-		await inputCheckboxDefaultChecked.trigger('change');
-		await inputCheckboxDefaultUnchecked.trigger('change');
+		await inputCheckboxDefaultChecked.trigger('input');
+		await inputCheckboxDefaultUnchecked.trigger('input');
 		await nextTick();
 
 		// Assert new values
@@ -288,4 +288,22 @@ describe('Form component', () => {
 		// Assert error message no longer present
 		expect(wrapper.find('.pdap-form-error-message').exists()).toBe(false);
 	});
+
+	test('Form waits to reset until resetOn prop switches to `true` and error is falsy', async () => {
+		const wrapper = mount(PdapForm, {
+			...base,
+			props: { ...base.props, error: 'foo', resetOn: false },
+		});
+
+		// Assert error state
+		expect(wrapper.find('.pdap-form-error-message').exists()).toBe(true);
+		// Assert error message
+		expect(wrapper.find('.pdap-form-error-message').text()).toBe('foo');
+
+		// Set values to correct values
+		await wrapper.setProps({ error: '', resetOn: true });
+
+		// Assert error message no longer present
+		expect(wrapper.find('.pdap-form-error-message').exists()).toBe(false);
+	});
 });
diff --git a/src/components/Form/types.ts b/src/components/Form/types.ts
index f056a69..210cd7e 100644
--- a/src/components/Form/types.ts
+++ b/src/components/Form/types.ts
@@ -35,4 +35,5 @@ export interface PdapFormProps {
 	id: string;
 	name: string;
 	schema: PdapFormSchema;
+	resetOn?: 'submit' | boolean;
 }
diff --git a/src/components/Header/PdapHeader.vue b/src/components/Header/PdapHeader.vue
index 667f2ca..9d5fc47 100644
--- a/src/components/Header/PdapHeader.vue
+++ b/src/components/Header/PdapHeader.vue
@@ -37,7 +37,6 @@ const navLogoLinkIsPath = props.logoImageAnchorPath.startsWith('/');
 
 // Lifecycle methods
 onMounted(() => {
-	console.debug('on mounted');
 	getHeightAndSetToCSSVar();
 	window.addEventListener('resize', getHeightAndSetToCSSVar);
 });
diff --git a/src/components/Input/Checkbox/InputCheckbox.vue b/src/components/Input/Checkbox/InputCheckbox.vue
index 252033b..0a58268 100644
--- a/src/components/Input/Checkbox/InputCheckbox.vue
+++ b/src/components/Input/Checkbox/InputCheckbox.vue
@@ -7,7 +7,7 @@
 		class="pdap-input-checkbox"
 		type="checkbox"
 		v-bind="$attrs"
-		@change="change"
+		@input="input"
 	/>
 </template>
 
@@ -18,10 +18,10 @@ defineProps<PdapInputCheckboxProps>();
 
 // Emits
 const emit = defineEmits<{
-	(event: 'change', val: Event): void;
+	(event: 'input', val: Event): void;
 }>();
 
-const change = (event: Event) => {
-	emit('change', event);
+const input = (event: Event) => {
+	emit('input', event);
 };
 </script>
diff --git a/src/components/Input/PdapInput.vue b/src/components/Input/PdapInput.vue
index 559bdac..1dc0b3a 100644
--- a/src/components/Input/PdapInput.vue
+++ b/src/components/Input/PdapInput.vue
@@ -49,7 +49,7 @@ const errorMessageId = computed(() => `pdap-${props.name}-input-error`);
 @layer components {
 	/* General input styles  */
 	.pdap-input {
-		@apply h-[max-content] gap-4 leading-normal mb-3 w-full flex flex-col;
+		@apply h-[max-content] gap-1 leading-normal mb-3 w-full flex flex-col;
 	}
 
 	.pdap-input input {
@@ -78,7 +78,7 @@ const errorMessageId = computed(() => `pdap-${props.name}-input-error`);
 	}
 
 	.pdap-input-error label {
-		@apply justify-start text-sm;
+		@apply justify-start;
 	}
 
 	.pdap-input-error input {
diff --git a/src/components/Input/Text/InputText.vue b/src/components/Input/Text/InputText.vue
index 8e88ad0..9da0f04 100644
--- a/src/components/Input/Text/InputText.vue
+++ b/src/components/Input/Text/InputText.vue
@@ -6,7 +6,6 @@
 		:placeholder="placeholder"
 		:value="value"
 		v-bind="$attrs"
-		@change="change"
 		@input="input"
 	/>
 </template>
@@ -18,14 +17,9 @@ defineProps<PdapInputTextProps>();
 
 // Emits
 const emit = defineEmits<{
-	(event: 'change', val: Event): void;
 	(event: 'input', val: Event): void;
 }>();
 
-const change = (event: Event) => {
-	emit('change', event);
-};
-
 const input = (event: Event) => {
 	emit('input', event);
 };
diff --git a/src/demo/pages/ComponentDemo.vue b/src/demo/pages/ComponentDemo.vue
index 25b42db..5ac7ff1 100644
--- a/src/demo/pages/ComponentDemo.vue
+++ b/src/demo/pages/ComponentDemo.vue
@@ -41,7 +41,7 @@
 			<div>
 				<h4>Or this:</h4>
 				<div
-					class="loading-shimmer h-48 bg-brand-gold flex flex-col justify-center items-center"
+					class="loading-shimmer h-48 bg-brand-gold flex flex-col justify-center items-center text-neutral-50"
 				>
 					<Spinner :show="true" text="Hello from the loading div" />
 				</div>
@@ -239,6 +239,7 @@ import { PdapDropdownTriggerType } from '../../components/Dropdown/types';
 
 const mockFormSchema = [
 	{
+		autocomplete: 'given-name',
 		id: 'first-name',
 		name: 'firstName',
 		label: 'What is your first name?',
@@ -252,6 +253,7 @@ const mockFormSchema = [
 		},
 	},
 	{
+		autocomplete: 'family-name',
 		id: 'last-name',
 		name: 'lastName',
 		label: 'What is your last name?',
@@ -339,7 +341,7 @@ function submit(values: Record<'firstName' | 'lastName' | 'iceCream', string>) {
 }
 
 function change(values: Record<'firstName' | 'lastName' | 'iceCream', string>) {
-	console.log('onChange', { values });
+	console.debug('onChange', { values });
 }
 
 onMounted(updateLoadingText);
diff --git a/src/demo/pages/SignupFormDemo.vue b/src/demo/pages/SignupFormDemo.vue
new file mode 100644
index 0000000..86e38ad
--- /dev/null
+++ b/src/demo/pages/SignupFormDemo.vue
@@ -0,0 +1,114 @@
+<template>
+	<main>
+		<Form
+			id="bar"
+			:error="error"
+			:schema="SCHEMA"
+			:reset-on="reset"
+			name="foo"
+			@submit="onSubmit"
+			@change="handleChange"
+		>
+			<Button type="submit">Submit</Button>
+		</Form>
+	</main>
+</template>
+
+<script setup lang="ts">
+import { PdapInputTypes } from '../../components/Input/types';
+import { Button, Form } from '../../components';
+import { ref } from 'vue';
+
+// Constants
+const SCHEMA = [
+	{
+		autocomplete: 'home email',
+		'data-test': 'email',
+		id: 'email',
+		name: 'email',
+		label: 'Email',
+		type: PdapInputTypes.TEXT,
+		placeholder: 'Your email address',
+		value: '',
+		validators: {
+			email: {
+				message: 'Please provide your email address',
+				value: true,
+			},
+		},
+	},
+	{
+		autocomplete: 'current-password',
+		'data-test': 'password',
+		id: 'password',
+		name: 'password',
+		label: 'Password',
+		type: PdapInputTypes.PASSWORD,
+		placeholder: 'Your password',
+		value: '',
+		validators: {
+			password: {
+				message: 'Please provide a valid password',
+				value: true,
+			},
+		},
+	},
+	{
+		autocomplete: 'current-password',
+		'data-test': 'confirm-password',
+		id: 'confirmPassword',
+		name: 'confirmPassword',
+		label: 'Confirm Password',
+		type: PdapInputTypes.PASSWORD,
+		placeholder: 'Confirm your password',
+		value: '',
+		validators: {
+			password: {
+				message: 'Please confirm your valid password',
+				value: true,
+			},
+		},
+	},
+];
+
+const error = ref<undefined | string>(undefined);
+const reset = ref(false);
+
+/**
+ * When signing up: handles clearing pw-match form errors on change if they exist
+ */
+function handleChange(formValues: Record<string, string>) {
+	if (error.value) {
+		handlePasswordValidation(formValues);
+	}
+}
+
+/**
+ * When signing up: validates that passwords match
+ * @returns {boolean} `false` if passwords do not match, `true` if they do
+ */
+function handlePasswordValidation(formValues: Record<string, string>) {
+	if (formValues.password !== formValues.confirmPassword) {
+		if (!error.value) {
+			error.value = 'Passwords do not match, please try again.';
+		}
+		return false;
+	} else {
+		error.value = undefined;
+		return true;
+	}
+}
+
+/**
+ * Logs user in or signs user up
+ */
+function onSubmit(formValues: Record<string, string>) {
+	if (!handlePasswordValidation(formValues)) {
+		reset.value = false;
+		return;
+	} else {
+		reset.value = true;
+		console.debug({ formValues });
+	}
+}
+</script>
diff --git a/src/demo/router.js b/src/demo/router.js
index 2237388..1dd200d 100644
--- a/src/demo/router.js
+++ b/src/demo/router.js
@@ -1,5 +1,6 @@
 import { createRouter, createWebHistory } from 'vue-router';
 import ComponentDemo from './pages/ComponentDemo.vue';
+import SignupFormDemo from './pages/SignupFormDemo.vue';
 
 const routes = [
 	{
@@ -40,6 +41,11 @@ const routes = [
 			},
 		],
 	},
+	{
+		path: '/sign-up-demo',
+		component: SignupFormDemo,
+		name: 'Login Demo',
+	},
 ];
 
 const router = createRouter({