diff --git a/src/apis/eduidSignup.ts b/src/apis/eduidSignup.ts
index cd9f685ac..73a1afb3f 100644
--- a/src/apis/eduidSignup.ts
+++ b/src/apis/eduidSignup.ts
@@ -30,7 +30,7 @@ export interface SignupState {
   };
   tou: { completed: boolean; version?: string };
   captcha: { completed: boolean };
-  credentials: { completed: boolean; password?: string };
+  credentials: { completed: boolean; generated_password?: string };
   user_created: boolean;
 }
 
diff --git a/src/components/Signup/SignupUserCreated.tsx b/src/components/Signup/SignupUserCreated.tsx
index 2ff8b2c50..d469e8eb5 100644
--- a/src/components/Signup/SignupUserCreated.tsx
+++ b/src/components/Signup/SignupUserCreated.tsx
@@ -65,14 +65,16 @@ export function SignupConfirmPassword() {
                 id="copy-new-password"
                 ref={ref}
                 defaultValue={
-                  signupState?.credentials.password ? formatPassword(signupState?.credentials.password) : ""
+                  signupState?.credentials.generated_password
+                    ? formatPassword(signupState?.credentials.generated_password)
+                    : ""
                 }
                 readOnly={true}
               />
               <CopyToClipboard ref={ref} />
             </mark>
             <NewPasswordForm
-              suggested_password={signupState?.credentials.password}
+              suggested_password={signupState?.credentials.generated_password}
               submitNewPasswordForm={submitNewPasswordForm}
               submitButtonText={<FormattedMessage defaultMessage="Ok" description="ok button" />}
             />
@@ -103,7 +105,7 @@ export function SignupUserCreated(): JSX.Element {
       </div>
       <ConfirmUserInfo
         email_address={signupState?.email.address as string}
-        new_password={formatPassword(signupState?.credentials.password)}
+        new_password={formatPassword(signupState?.credentials.generated_password)}
       />
       <div className="buttons">
         <EduIDButton id={idFinishedButton} buttonstyle="link" className="normal-case" type="submit">