diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPersonalDetails.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPersonalDetails.cshtml
index f41ee8cec..0e289eb4e 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPersonalDetails.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPersonalDetails.cshtml
@@ -80,7 +80,7 @@
type="text"
spell-check="false"
hint-text=""
- autocomplete="SecondaryEmailAddress"
+ autocomplete="email"
css-class="nhsuk-u-width-one-half"
required="false" />
diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/ChangeFirstname.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/ChangeFirstname.cshtml
index df034473c..5e966bebb 100644
--- a/LearningHub.Nhs.WebUI/Views/MyAccount/ChangeFirstname.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyAccount/ChangeFirstname.cshtml
@@ -26,7 +26,7 @@
type="text"
spell-check="false"
hint-text=""
- autocomplete="FirstName"
+ autocomplete="given-name"
css-class="nhsuk-u-width-one-half "
required="true"
required-client-side-error-message="Enter a first name" />
diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/ChangeLastName.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/ChangeLastName.cshtml
index 242ff6a2f..6cf380170 100644
--- a/LearningHub.Nhs.WebUI/Views/MyAccount/ChangeLastName.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyAccount/ChangeLastName.cshtml
@@ -25,7 +25,7 @@
type="text"
spell-check="false"
hint-text=""
- autocomplete="LastName"
+ autocomplete="family-name"
css-class="nhsuk-u-width-one-half"
required="true"
required-client-side-error-message="Enter a last name" />
diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/ChangePreferredName.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/ChangePreferredName.cshtml
index f4e38a767..d7106bd02 100644
--- a/LearningHub.Nhs.WebUI/Views/MyAccount/ChangePreferredName.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyAccount/ChangePreferredName.cshtml
@@ -24,7 +24,7 @@
type="text"
spell-check="false"
hint-text=""
- autocomplete="PreferredName"
+ autocomplete="nickname"
css-class="nhsuk-u-width-one-half"
required="false" />
diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/ChangePrimaryEmail.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/ChangePrimaryEmail.cshtml
index df41f9844..5f84662e6 100644
--- a/LearningHub.Nhs.WebUI/Views/MyAccount/ChangePrimaryEmail.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyAccount/ChangePrimaryEmail.cshtml
@@ -32,7 +32,7 @@
type="text"
spell-check="false"
hint-text=""
- autocomplete="PrimaryEmailAddress"
+ autocomplete="email"
css-class="nhsuk-u-width-one-half"
required="true"
/>
diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/ChangeSecondaryEmail.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/ChangeSecondaryEmail.cshtml
index 63709465e..69b92fb04 100644
--- a/LearningHub.Nhs.WebUI/Views/MyAccount/ChangeSecondaryEmail.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyAccount/ChangeSecondaryEmail.cshtml
@@ -32,7 +32,7 @@
type="text"
spell-check="false"
hint-text=""
- autocomplete="SecondaryEmailAddress"
+ autocomplete="email"
css-class="nhsuk-u-width-one-half"
required="false" />