diff --git a/src/components/Container/SettingsPage.vue b/src/components/Container/SettingsPage.vue
index db1a6dff5..013b3edaa 100644
--- a/src/components/Container/SettingsPage.vue
+++ b/src/components/Container/SettingsPage.vue
@@ -8,6 +8,7 @@ import ThemeForm from '@/components/Form/context/ThemeForm.vue';
 import DateTimeForm from '@/components/Form/context/DateTimeForm.vue';
 import DoiSetupSettingsForm from '@/components/Form/context/DoiSetupSettingsForm.vue';
 import DoiRegistrationSettingsForm from '@/components/Form/context/DoiRegistrationSettingsForm.vue';
+import OrcidSettingsForm from '@/components/Form/context/OrcidSettingsForm.vue';
 
 export default {
 	name: 'SettingsPage',
@@ -20,6 +21,7 @@ export default {
 		DateTimeForm,
 		DoiSetupSettingsForm,
 		DoiRegistrationSettingsForm,
+		OrcidSettingsForm,
 	},
 	extends: Page,
 	data() {
diff --git a/src/components/Form/context/OrcidSettingsForm.vue b/src/components/Form/context/OrcidSettingsForm.vue
new file mode 100644
index 000000000..4b865a753
--- /dev/null
+++ b/src/components/Form/context/OrcidSettingsForm.vue
@@ -0,0 +1,27 @@
+<script>
+import Form from '../Form.vue';
+
+export default {
+	name: 'OrcidSettingsForm',
+	extends: Form,
+	props: {},
+	methods: {
+		/**
+		 * Update values when a field has changed
+		 *
+		 * @param {String} name Name of the field to modify
+		 * @param {String} prop Name of the prop to modify
+		 * @param {mixed} value The new value for the prop
+		 * @param {String} localeKey Optional locale key for multilingual props
+		 */
+		fieldChanged: function (name, prop, value, localeKey) {
+			if (name === 'orcidEnabled') {
+				this.removeError('orcidProfileAPIPath', localeKey);
+				this.removeError('orcidClientId', localeKey);
+				this.removeError('orcidClientSecret', localeKey);
+			}
+			Form.methods.fieldChanged.apply(this, [name, prop, value, localeKey]);
+		},
+	},
+};
+</script>