diff --git a/src/translation/extractedMessages.json b/src/translation/extractedMessages.json
index 5bfc028e9..98c14f250 100644
--- a/src/translation/extractedMessages.json
+++ b/src/translation/extractedMessages.json
@@ -35,10 +35,6 @@
     "developer_comment": "method svipe - paragraph",
     "string": ", you could use {emphasis} to verify your identity using your passport. Read more about Svipe iD below."
   },
-  "+j4RcB": {
-    "developer_comment": "Registration confirm password",
-    "string": "Confirm your password for registration completion."
-  },
   "/+3WQI": {
     "developer_comment": "recommendation title",
     "string": "Recommended actions for you"
@@ -87,10 +83,6 @@
     "developer_comment": "select extra webauthn",
     "string": "Choose extra identification method:"
   },
-  "/hAEZl": {
-    "developer_comment": "mfa reset-password tapit",
-    "string": "Use your security key to reset password. If it has a button, tap it."
-  },
   "/oseeC": {
     "developer_comment": "Registration finished",
     "string": "These are your login details for eduID. Save the password! Note: spaces in the generated password are there for legibility and will be removed automatically if entered. Once you've logged in it is possible to change your password."
@@ -211,10 +203,6 @@
     "developer_comment": "Dashboard nav tab name",
     "string": "Settings"
   },
-  "2nIzjL": {
-    "developer_comment": "Signup",
-    "string": "Code expired"
-  },
   "2t+kHd": {
     "developer_comment": "why have eduID - heading",
     "string": "Why have eduID?"
@@ -243,6 +231,10 @@
     "developer_comment": "when use eduID - list item 2",
     "string": "organise your student account for email and intranet,"
   },
+  "3Y8gXc": {
+    "developer_comment": "Account recovery front page",
+    "string": "Click the button below to send an e-mail to {email}"
+  },
   "3iy3CU": {
     "developer_comment": "ErrorURL authentication failure",
     "string": "The service you tried to access failed during the authentication stage."
@@ -322,10 +314,6 @@
     "developer_comment": "method eidas - heading",
     "string": "If you are an EU citizen and without a Swedish personal identity number"
   },
-  "5P95+P": {
-    "developer_comment": "Reset password add email heading",
-    "string": "Enter the email address registered to your eduID account."
-  },
   "5YRJfk": {
     "developer_comment": "accordion item eidas additional info",
     "string": "With eIDAS electronic identification"
@@ -345,6 +333,10 @@
     "developer_comment": "security second factor",
     "string": "Add a security key as a second layer of identification, beyond username and password, to prove you are the owner of your eduID."
   },
+  "61F71s": {
+    "developer_comment": "mfa security key heading",
+    "string": "Reset Password: Use security key"
+  },
   "6RftZU": {
     "developer_comment": "choosing usb key - heading",
     "string": "Choosing a Security Key"
@@ -389,6 +381,10 @@
     "developer_comment": "column value label",
     "string": "Value"
   },
+  "7rfaTz": {
+    "developer_comment": "Account recovery front page heading",
+    "string": "Reset Password: Start account recovery process"
+  },
   "7yS+J6": {
     "developer_comment": "edit button",
     "string": "edit"
@@ -497,6 +493,10 @@
     "developer_comment": "Advanced settings",
     "string": "Advanced settings"
   },
+  "AfTLxJ": {
+    "developer_comment": "mfa reset-password tapit",
+    "string": "If it has a button, tap it."
+  },
   "AoUp1z": {
     "developer_comment": "enhance eduID verification - paragraph",
     "string": "For more detailed information on how to verify your created account based on your situation, see the 'Verification of Identity' help section."
@@ -577,10 +577,6 @@
     "developer_comment": "how to contact support - paragraph 1",
     "string": "If you can't find the answers to your questions about eduID on this help page, you can contact the eduID support by mailing {support}."
   },
-  "DuBOC3": {
-    "developer_comment": "Set new password",
-    "string": "Set your new password"
-  },
   "DuLi7B": {
     "developer_comment": "verify identity unverified description",
     "string": "Some services need to know your real life identity. Connect your identity to your eduID to get the most benefit from it."
@@ -652,6 +648,10 @@
     "developer_comment": "profile email display no data",
     "string": "no email added"
   },
+  "FsCTCK": {
+    "developer_comment": "Reset Password set new password success heading",
+    "string": "Reset Password: Completed"
+  },
   "FutYRQ": {
     "string": "Use my {freja_eidplus_verbatim}"
   },
@@ -810,10 +810,6 @@
   "KWAMem": {
     "string": "Click \"continue\" once you have logged in on the other device"
   },
-  "KZrck9": {
-    "developer_comment": "Signup",
-    "string": "Verification of email address"
-  },
   "KaX8vx": {
     "developer_comment": "pd label en",
     "string": "English"
@@ -866,10 +862,6 @@
     "developer_comment": "mfa problems heading",
     "string": "Problems?"
   },
-  "LuSrd4": {
-    "developer_comment": "Signup",
-    "string": "Register your email address to create your eduID."
-  },
   "LxAnnP": {
     "developer_comment": "Reset password",
     "string": "Send sms to {phone}"
@@ -886,6 +878,10 @@
     "developer_comment": "usb key technical section - list item 2",
     "string": "it must not contain any other status in the metadata than a few variants of:"
   },
+  "MHzJ0N": {
+    "developer_comment": "Reset Password set new password success lead",
+    "string": "These is your new password for eduID. Save the password! Once you've logged in it is possible to change your password."
+  },
   "Mcx0Ut": {
     "developer_comment": "what is accessibility report - paragraph 2",
     "string": "It is of outmost importance to us that as many as possible are able to use the service in a convenient and safe manner and is one of the many ways eduID is always striving to improve."
@@ -1018,10 +1014,6 @@
     "developer_comment": "what is svipe - heading",
     "string": "What is Svipe iD?"
   },
-  "PwI8gG": {
-    "developer_comment": "Reset Password set new password success",
-    "string": "Password has been updated."
-  },
   "PxROOc": {
     "developer_comment": "help text for custom password label",
     "string": "Tip: Choose a strong password"
@@ -1034,6 +1026,10 @@
     "developer_comment": "mfa try again",
     "string": "Try again"
   },
+  "QDS1P5": {
+    "developer_comment": "signup last name",
+    "string": "Last name"
+  },
   "QHR4Ik": {
     "developer_comment": "about freja - handle",
     "string": "About Freja+"
@@ -1097,10 +1093,6 @@
     "developer_comment": "Currently in progress title",
     "string": "Currently in progress"
   },
-  "SJUMOA": {
-    "developer_comment": "Reset Password heading",
-    "string": "Reset password"
-  },
   "SK2AK4": {
     "developer_comment": "method svipe - heading",
     "string": "If you are not an EU citizen and without a Swedish personal identity number"
@@ -1178,6 +1170,10 @@
     "developer_comment": "Dashboard change password modal title",
     "string": "For security reasons..."
   },
+  "TtQt1m": {
+    "developer_comment": "Registration complete",
+    "string": "Register: Completed"
+  },
   "TxOjgK": {
     "developer_comment": "need visit atg agent for freja - paragraph",
     "string": "Only if you use another means of identification than a Swedish passport. On site, the agent can start the verification process by scanning a QR code in your app and follow the instructions in their terminal. You will be informed when you have passed the ID verification and will be able use your Freja+ with your eduID. It can take up to three hours for your Freja+ to be fully activated."
@@ -1297,6 +1293,10 @@
     "developer_comment": "accordion item swedish title",
     "string": "Swedish personal ID or coordination number"
   },
+  "Xl8Jtp": {
+    "developer_comment": "signup first name",
+    "string": "First name"
+  },
   "XrBwSu": {
     "developer_comment": "eidas freja instruction tip1",
     "string": "Tip: Use the app to find your nearest agent"
@@ -1349,6 +1349,10 @@
     "developer_comment": "Use another device, finished",
     "string": "After using the code on the other device, please close this browser window."
   },
+  "ZF97+M": {
+    "developer_comment": "Reset Password phone code sent lead",
+    "string": "Please enter the code sent to {phone}"
+  },
   "ZHgxHT": {
     "developer_comment": "ErrorURL unknown error",
     "string": "Access Error"
@@ -1385,10 +1389,6 @@
     "developer_comment": "Signup credentials button",
     "string": "Retry"
   },
-  "ZyrvXd": {
-    "developer_comment": "Registration complete",
-    "string": "You have completed the registration for eduID."
-  },
   "a2qUxL": {
     "developer_comment": "Title for phone code input",
     "string": "Enter the code sent to {phone}"
@@ -1496,10 +1496,6 @@
   "bankid.token_not_found": {
     "string": "U2F token not found"
   },
-  "bcHXR2": {
-    "developer_comment": "Account recovery front page",
-    "string": "To start the account recovery process, press the button below to send an e-mail to {email}."
-  },
   "beRQGp": {
     "developer_comment": "Short code form",
     "string": "Code expires in"
@@ -1567,6 +1563,10 @@
     "developer_comment": "letter initialize proofing help text",
     "string": "You will receive a letter which contains a code that for security reasons expires in two weeks."
   },
+  "dEXuhK": {
+    "developer_comment": "Signup",
+    "string": "Register: Verification of email address"
+  },
   "dHoc4Y": {
     "developer_comment": "eidas modal title",
     "string": "Use Freja eID+ and pass a local authorised agent"
@@ -1578,6 +1578,10 @@
   "dKcigP": {
     "string": "The code sent to {email} has expired."
   },
+  "dLknIH": {
+    "developer_comment": "Set new password",
+    "string": "Reset Password: Set new password"
+  },
   "dQm5ii": {
     "developer_comment": "usb key technical section - list item 4",
     "string": "and must not support any other key protection than:"
@@ -1628,6 +1632,10 @@
     "developer_comment": "how to contact support - paragraph 3",
     "string": ", but for simple matters you can also reach us on phone number {phone}."
   },
+  "e6XTxx": {
+    "developer_comment": "Reset Password email link sent",
+    "string": "If you have an eduID account, the code has been sent to {email}"
+  },
   "eFceSz": {
     "developer_comment": "Display name select placeholder",
     "string": "Select display name..."
@@ -1644,10 +1652,6 @@
     "developer_comment": "Login OtherDevice",
     "string": "Log in this device"
   },
-  "eLbkSr": {
-    "developer_comment": "Signup",
-    "string": "Confirm that you are a human."
-  },
   "eMsBRu": {
     "developer_comment": "how remove linked orcid - paragraph",
     "string": "If you do not longer want eduID to know your ORCID iD you can remove it by clicking the Remove button in your eduID."
@@ -1873,6 +1877,10 @@
     "developer_comment": "Copy tooltip",
     "string": "Copy to clipboard"
   },
+  "hnyHof": {
+    "developer_comment": "HandleExtraSecurities heading",
+    "string": "Reset Password: Verification method"
+  },
   "hq/xBV": {
     "developer_comment": "Use other device 2",
     "string": "Request denied."
@@ -1901,6 +1909,10 @@
     "developer_comment": "Signup credentials",
     "string": "There was a problem creating your account."
   },
+  "iSg5BA": {
+    "developer_comment": "Signup",
+    "string": "Register: Code expired"
+  },
   "iSo6Bf": {
     "developer_comment": "accordion item additional info Verification with Swedish national ID number",
     "string": "If you have obtained a Swedish national ID number you are able to verify your identity with the Swedish national ID number."
@@ -1917,13 +1929,13 @@
     "developer_comment": "accessibility report - link",
     "string": "Accessibility report"
   },
+  "ikmIz4": {
+    "developer_comment": "Signup",
+    "string": "Register: Confirm that you are a human."
+  },
   "invalid username": {
     "string": "Invalid username"
   },
-  "irC/sN": {
-    "developer_comment": "Reset Password phone code sent",
-    "string": "Enter the code sent to {phone}"
-  },
   "iyw+WR": {
     "developer_comment": "usb key technical section - list item 3 code",
     "string": "\"faceprint_internal\", \"passcode_external\", \"passcode_internal\", \"handprint_internal\", \"pattern_internal\", \"voiceprint_internal\", \"fingerprint_internal\", \"eyeprint_internal\""
@@ -1975,6 +1987,10 @@
   "kHCeni": {
     "string": "Enter the six digit code sent to {email} to verify your email address. You can also copy and paste the code from the email into the input field."
   },
+  "kK4Hum": {
+    "developer_comment": "Account recovery cancel information",
+    "string": "If you decide to cancel, simply click the Go Back button to return to the login page."
+  },
   "kN1GC+": {
     "developer_comment": "Make primary button",
     "string": "make primary"
@@ -2014,6 +2030,10 @@
     "developer_comment": "SAML login finished",
     "string": "Retry"
   },
+  "lNjmQc": {
+    "developer_comment": "Terms of use (heading)",
+    "string": "Register: Terms of use"
+  },
   "lXwaZ5": {
     "developer_comment": "security verify",
     "string": "Freja+"
@@ -2052,7 +2072,7 @@
   },
   "letter.placeholder": {
     "developer_comment": "Placeholder for letter proofing text input",
-    "string": "Code"
+    "string": "enter code"
   },
   "letter.saved-unconfirmed": {
     "string": "A letter with a code has been sent."
@@ -2256,6 +2276,10 @@
     "developer_comment": "Notification type",
     "string": "Information"
   },
+  "nsFjU0": {
+    "developer_comment": "ResetPasswordEnterEmail lead text",
+    "string": "Once entered, if the address is registered, a message with instructions to reset the password will be sent."
+  },
   "nuB/SD": {
     "developer_comment": "captcha input label",
     "string": "Enter the code from the image"
@@ -2291,10 +2315,6 @@
     "developer_comment": "use ladok - list item 2",
     "string": "choose your institution from the drop down list - if it is available."
   },
-  "oiMtbK": {
-    "developer_comment": "Terms of use (heading)",
-    "string": "Terms of use"
-  },
   "ojB17W": {
     "string": "Swedish eID"
   },
@@ -2423,6 +2443,10 @@
     "developer_comment": "privacy policy - list item 2",
     "string": "transfers information according to the data minimisation principle - never more than required,"
   },
+  "piqcwF": {
+    "developer_comment": "Signup",
+    "string": "Register: Enter the email address"
+  },
   "piqytF": {
     "developer_comment": "how add security key - paragraph 2",
     "string": "Note: once you have added a security key to your eduID it must be used to log in."
@@ -2435,6 +2459,14 @@
     "developer_comment": "placeholder text for email input",
     "string": "name@example.com"
   },
+  "placeholder.firstName": {
+    "developer_comment": "placeholder First name",
+    "string": "First name"
+  },
+  "placeholder.lastName": {
+    "developer_comment": "placeholder Last name",
+    "string": "Last name"
+  },
   "placeholder.password": {
     "developer_comment": "placeholder text for password input",
     "string": "enter password"
@@ -2511,10 +2543,6 @@
     "developer_comment": "Reset Password button",
     "string": "send email"
   },
-  "qiazcf": {
-    "developer_comment": "Reset Password email link sent",
-    "string": "If you have an eduID account, the code has been sent to {email}."
-  },
   "qkwsql": {
     "developer_comment": "Login MFA",
     "string": "If you have a Swedish national identity number and Freja eID+, confirm your identity and you'll be able to use Freja eID+ to log in."
@@ -2542,6 +2570,10 @@
     "developer_comment": "which login email - heading",
     "string": "Which email account should I use to log in?"
   },
+  "raU2o7": {
+    "developer_comment": "Registration confirm password",
+    "string": "Register: Confirm your password"
+  },
   "required": {
     "string": "*Field cannot be empty"
   },
@@ -2596,6 +2628,10 @@
   "resetpw.user-not-found": {
     "string": "If the address is registered, a message with instructions to reset the password has been sent."
   },
+  "rr418r": {
+    "developer_comment": "HandleExtraSecurities lead text",
+    "string": "Select an extra security option to maintain identity confirmation during the password reset process, or continue without extra security, with identity confirmation required after the password reset."
+  },
   "ryPtkg": {
     "developer_comment": "Security keys list - paragraph",
     "string": "Next update"
@@ -2608,9 +2644,9 @@
     "developer_comment": "method eidas - paragraph",
     "string": ", you could use {emphasis} to verify your identity. Read more about eIDAS below."
   },
-  "sIENAc": {
-    "developer_comment": "extra security description",
-    "string": "A password reset using an extra security option will keep your account confirmed."
+  "sC4pUE": {
+    "developer_comment": "ResetPasswordEnterEmail heading",
+    "string": "Reset Password: Enter the email address"
   },
   "sbCA3x": {
     "developer_comment": "swedish nin - heading",
@@ -2785,10 +2821,6 @@
     "developer_comment": "use eidas - list item 1",
     "string": "make sure you have an electronic ID from a connected country to have the possibility to authenticate yourself via eIDAS,"
   },
-  "tQpfHe": {
-    "developer_comment": "Reset Password go to eduID",
-    "string": "Go to eduID"
-  },
   "tUkPGr": {
     "developer_comment": "verify identity vetting explanation add swedish phone",
     "string": "Only possible with Swedish phone number"
@@ -2797,6 +2829,10 @@
     "developer_comment": "emails enter code",
     "string": "Code"
   },
+  "tW2jR4": {
+    "developer_comment": "Reset Password email link sent heading",
+    "string": "Reset Password: Verify email address"
+  },
   "tarlwb": {
     "developer_comment": "use svipe - list item 2",
     "string": "login to eduID and scan the QR code produced by Svipe iD from the 'All other countries' section in the Identity area of eduID by following the instructions."
@@ -2844,6 +2880,10 @@
   "user-out-of-sync": {
     "string": "User data is out of sync. Reload page to re-sync."
   },
+  "uzDSzk": {
+    "developer_comment": "Reset Password phone code sent heading",
+    "string": "Reset Password: Phone verification"
+  },
   "uzoZmv": {
     "developer_comment": "Login front page",
     "string": "Log in"