diff --git a/signup-ui/public/locales/en.json b/signup-ui/public/locales/en.json
index 3b841314..10495f07 100644
--- a/signup-ui/public/locales/en.json
+++ b/signup-ui/public/locales/en.json
@@ -16,7 +16,7 @@
   "error": "Error!",
   "invalid": "Invalid!",
   "signup_failed": "Sign-Up Failed!",
-  "mobile_number_verified": "Your mobile number has been verified successfully. Please continue to setup you account and complete the registration process.",
+  "mobile_number_verified": "Your mobile number has been verified successfully. Please continue to setup your account and complete the registration process.",
   "mobile_number_already_registered": "The provided mobile number is already registered. Please use the Login option to proceed.",
   "setup_account": "Setup Account",
   "complete_your_registration": "Please enter the requested details to complete your registration.",
@@ -24,10 +24,10 @@
   "username_placeholder": "Enter username",
   "full_name": "Full Name in Khmer",
   "full_name_placeholder": "Enter Full Name in Khmer",
-  "full_name_tooltip": "Maximum 30 characters allowed and it should not contain any digit or special characters except “ “ space.",
+  "full_name_tooltip": "Maximum 30 characters allowed with no alphabets or special characters, except space.",
   "password": "Password",
   "password_placeholder": "Enter Password",
-  "password_rules": "<ul><li>Require at least 8 characters long</li> <li>Require at least 1 digit</li> <li>Require at least 1 special character</li> <li>Require at least 1 capital letter</li></ul>",
+  "password_rules": "Use 8 or more characters with a mix of alphabets and at least one number.",
   "confirm_password": "Confirm Password",
   "confirm_password_placeholder": "Enter Password",
   "terms_and_condition": "I agree to Cambodia’s <TermsAndConditionsAnchor>Terms & Conditions</TermsAndConditionsAnchor> and <PrivacyPolicyAnchor>Privacy Policy</PrivacyPolicyAnchor>, to store & process my information as required.",
diff --git a/signup-ui/public/locales/km.json b/signup-ui/public/locales/km.json
index 076cc917..5d82baba 100644
--- a/signup-ui/public/locales/km.json
+++ b/signup-ui/public/locales/km.json
@@ -24,10 +24,10 @@
   "username_placeholder": "បញ្ចូលឈ្មោះ​អ្នកប្រើប្រាស់",
   "full_name": "គោត្តនាម-នាម",
   "full_name_placeholder": "បញ្ចូលគោត្តនាម-នាមជាភាសាខ្មែរ",
-  "full_name_tooltip": "ជាអតិបរមា 30 តួអក្សរត្រូវបានអនុញ្ញាត និងមិនគួរមានលេខ ឬតួអក្សរពិសេសណាមួយឡើយ លើកលែងតែ “ “ ចន្លោះ។",
+  "full_name_tooltip": "ជាអតិបរមា 30 តួអក្សរត្រូវបានអនុញ្ញាត និងមិនគួរមានលេខ ឬតួអក្សរពិសេសណាមួយឡើយ លើកលែងតែដកឃ្លា។",
   "password": "ពាក្យសម្ងាត់",
   "password_placeholder": "បញ្ចូលពាក្យសម្ងាត់",
-  "password_rules": "<ul><li>យ៉ាងតិច 8 តួអក្សរ</li> <li>យ៉ាងតិច 1 តួលេខ</li> <li>យ៉ាងតិច 1 តួអក្សរពិសេស</li> <li>យ៉ាងតិច 1 តួអក្សរធំ</li></ul>",
+  "password_rules": "ប្រើតួអក្សរ 8 ឬច្រើនជាមួយតួអក្សរពិសេស និងយ៉ាងហោចណាស់តួលេខមួយយ៉ាងតិច។",
   "confirm_password": "បញ្ជាក់ពាក្យសម្ងាត់",
   "confirm_password_placeholder": "បញ្ចូលពាក្យសម្ងាត់",
   "terms_and_condition": "ខ្ញុំយល់ព្រមតាម<TermsAndConditionsAnchor>លក្ខខណ្ឌ</TermsAndConditionsAnchor> និង<PrivacyPolicyAnchor>គោលការណ៍ឯកជនភាព</PrivacyPolicyAnchor>របស់ប្រទេសកម្ពុជា ដើម្បីរក្សាទុក និងដំណើរការព័ត៌មានរបស់ខ្ញុំតាមតម្រូវការ។",
diff --git a/signup-ui/src/pages/SignUpPage/AccountSetup/AccountSetup.tsx b/signup-ui/src/pages/SignUpPage/AccountSetup/AccountSetup.tsx
index cfbb146a..fa880f68 100644
--- a/signup-ui/src/pages/SignUpPage/AccountSetup/AccountSetup.tsx
+++ b/signup-ui/src/pages/SignUpPage/AccountSetup/AccountSetup.tsx
@@ -233,7 +233,7 @@ export const AccountSetup = ({ settings, methods }: AccountSetupProps) => {
                         <PopoverTrigger asChild>
                           <Icons.info className="h-4 w-4 cursor-pointer" />
                         </PopoverTrigger>
-                        <PopoverContent side="right" className="w-full">
+                        <PopoverContent side="right">
                           <Trans
                             i18nKey="password_rules"
                             components={{