diff --git a/packages/cli/src/CredentialsHelper.ts b/packages/cli/src/CredentialsHelper.ts
index bdc5b98f4..771ca5bdd 100644
--- a/packages/cli/src/CredentialsHelper.ts
+++ b/packages/cli/src/CredentialsHelper.ts
@@ -551,6 +551,13 @@ export class CredentialsHelper extends ICredentialsHelper {
 			});
 		}
 
+		if (credentialsDecrypted.data) {
+			credentialsDecrypted.data = CredentialsOverwrites().applyOverwrite(
+				credentialType,
+				credentialsDecrypted.data,
+			);
+		}
+
 		if (typeof credentialTestFunction === 'function') {
 			// The credentials get tested via a function that is defined on the node
 			const credentialTestFunctions = NodeExecuteFunctions.getCredentialTestFunctions();
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
index 63aa1f3a9..70187230a 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
@@ -231,7 +231,10 @@ export default mixins(showMessage, nodeHelpers).extend({
 
 		if (this.credentialType) {
 			for (const property of this.credentialType.properties) {
-				if (!this.credentialData.hasOwnProperty(property.name)) {
+				if (
+					!this.credentialData.hasOwnProperty(property.name) &&
+					!this.credentialType.__overwrittenProperties?.includes(property.name)
+				) {
 					Vue.set(this.credentialData, property.name, property.default as CredentialInformation);
 				}
 			}
@@ -516,7 +519,7 @@ export default mixins(showMessage, nodeHelpers).extend({
 				);
 			}
 
-			// The properties defined on the parent credentials take presidence
+			// The properties defined on the parent credentials take precedence
 			NodeHelpers.mergeNodeProperties(
 				combineProperties,
 				credentialTypeData.properties,