diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/change-password-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/change-password-modal.token.ts
index 2473bd8f44..7fc93d6312 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/change-password-modal.token.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/change-password-modal.token.ts
@@ -5,9 +5,8 @@ export interface UmbChangePasswordModalData {
 }
 
 export interface UmbChangePasswordModalValue {
+	oldPassword: string;
 	newPassword: string;
-	confirmPassword: string;
-	oldPassword?: string;
 }
 
 export const UMB_CHANGE_PASSWORD_MODAL = new UmbModalToken<UmbChangePasswordModalData, UmbChangePasswordModalValue>(
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/modals/change-password/change-password-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/modals/change-password/change-password-modal.element.ts
index 81d8c222d6..dfeed427aa 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/modals/change-password/change-password-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/modals/change-password/change-password-modal.element.ts
@@ -1,11 +1,11 @@
 import { UmbUserItemRepository } from '../../user/repository/item/user-item.repository.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, CSSResultGroup, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit';
-import { UmbChangePasswordModalData, UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
+import { UmbChangePasswordModalData, UmbChangePasswordModalValue, UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import { UMB_AUTH_CONTEXT } from '@umbraco-cms/backoffice/auth';
 
 @customElement('umb-change-password-modal')
-export class UmbChangePasswordModalElement extends UmbModalBaseElement<UmbChangePasswordModalData> {
+export class UmbChangePasswordModalElement extends UmbModalBaseElement<UmbChangePasswordModalData, UmbChangePasswordModalValue> {
 	@state()
 	private _headline: string = 'Change password';
 
@@ -35,7 +35,7 @@ export class UmbChangePasswordModalElement extends UmbModalBaseElement<UmbChange
 		const newPassword = formData.get('newPassword') as string;
 		const confirmPassword = formData.get('confirmPassword') as string;
 
-		this.modalContext?.submit({ oldPassword, newPassword, confirmPassword });
+		this.modalContext?.submit({ oldPassword, newPassword });
 	}
 
 	constructor() {