diff --git a/src/app/user-management/change-password/change-password.component.html b/src/app/user-management/change-password/change-password.component.html
index 37e5894..e576a59 100644
--- a/src/app/user-management/change-password/change-password.component.html
+++ b/src/app/user-management/change-password/change-password.component.html
@@ -26,16 +26,16 @@
                                                          <div class="row g-3 mb-3">
                                                             <div class="col-md-6">
                                                                 <div class="d-flex align-items-center gap-2">
-                                                                    <label for="OldPassword" class="text-nowrap">
-                                                                        {{ 'OldPassword' | translate }}<span
+                                                                    <label for="oldPassword" class="text-nowrap">
+                                                                        {{ 'oldPassword' | translate }}<span
                                                                             class="mandatory">*</span>
                                                                     </label>
                                                                     <div class="password-wrapper position-relative w-100">
                                                                         <div class="d-flex flex-row align-items-stretch">
-                                                                        <input type="text" id="OldPassword"
+                                                                        <input type="text" id="oldPassword"
                                                                             class="form-control"
                                                                             type="{{passwordType}}"
-                                                                            placeholder="{{ 'OldPassword' | translate }}" appNoWhitespaces
+                                                                            placeholder="{{ 'oldPassword' | translate }}" appNoWhitespaces
                                                                             />
                                                                              <app-password-hide-show #psh class="password-eye align-items-stretch" [showPassword]="true" (onEyeClick)="togglePasswordType()"></app-password-hide-show>
                                                                        </div>
@@ -47,18 +47,18 @@
                                                             </div>
                                                             <div class="col-md-6">
                                                                 <div class="d-flex align-items-start gap-2">
-                                                                    <label for="EnterNewPassword"
+                                                                    <label for="enterNewPassword"
                                                                         class="text-nowrap mt-2">
-                                                                        {{ 'EnterNewPassword' | translate }}<span
+                                                                        {{ 'enterNewPassword' | translate }}<span
                                                                             class="mandatory">*</span>
                                                                     </label>
                                                                     <div class="password-wrapper position-relative w-100">
                                                                         
-                                                                            <input id="EnterNewPassword"
+                                                                            <input id="enterNewPassword"
                                                                             class="form-control"
                                                                             type="{{passwordType1}}"
                                                                             maxlength="500"
-                                                                            placeholder="{{ 'EnterNewPassword' | translate }}" appNoWhitespaces
+                                                                            placeholder="{{ 'enterNewPassword' | translate }}" appNoWhitespaces
                                                                             rows="3"  />
                                                                             <app-password-hide-show #psh1 class="password-eye align-items-stretch" [showPassword]="true" (onEyeClick)="togglePasswordType1()"></app-password-hide-show>
                                                                        
diff --git a/src/app/user-management/reset-password/reset-password.component.html b/src/app/user-management/reset-password/reset-password.component.html
index 3897e4c..077c8bc 100644
--- a/src/app/user-management/reset-password/reset-password.component.html
+++ b/src/app/user-management/reset-password/reset-password.component.html
@@ -19,23 +19,23 @@
                                             <div class="card mb-0 mt-2">
                                                 <div
                                                     class="card-header font-edit-13-child d-flex justify-content-between align-items-center">
-                                                    {{'ResetPassword' | translate}}
+                                                    {{'resetPassword' | translate}}
                                                 </div>
                                                 <div class="card-body">
                                                     <form >
                                                          <div class="row g-3 mb-3">
                                                             <div class="col-md-6">
                                                                 <div class="d-flex align-items-center gap-2">
-                                                                    <label for="UserID" class="text-nowrap">
-                                                                        {{ 'UserID' | translate }}<span
+                                                                    <label for="userID" class="text-nowrap">
+                                                                        {{ 'userID' | translate }}<span
                                                                             class="mandatory">*</span>
                                                                     </label>
                                                                     <div class="password-wrapper position-relative w-100">
                                                                         <div class="d-flex flex-row align-items-stretch">
-                                                                        <input type="text" id="UserID"
+                                                                        <input type="text" id="userID"
                                                                             class="form-control"
                                                                             
-                                                                            placeholder="{{ 'UserID' | translate }}" appNoWhitespaces
+                                                                            placeholder="{{ 'userID' | translate }}" appNoWhitespaces
                                                                             
                                                                             />
                                                                             
@@ -48,19 +48,19 @@
                                                             </div>
                                                             <div class="col-md-6">
                                                                 <div class="d-flex align-items-start gap-2">
-                                                                    <label for="EnterNewPassword"
+                                                                    <label for="enterNewPassword"
                                                                         class="text-nowrap mt-2">
-                                                                        {{ 'EnterNewPassword' | translate }}<span
+                                                                        {{ 'enterNewPassword' | translate }}<span
                                                                             class="mandatory">*</span>
                                                                     </label>
                                                                     <div class="password-wrapper position-relative w-100">
                                                                         
-                                                                            <input id="EnterNewPassword"
+                                                                            <input id="enterNewPassword"
                                                                             class="form-control"
                                                                             autocomplete="new-password"
                                                                             type="{{passwordType1}}"
                                                                             maxlength="500"
-                                                                            placeholder="{{ 'EnterNewPassword' | translate }}" appNoWhitespaces
+                                                                            placeholder="{{ 'enterNewPassword' | translate }}" appNoWhitespaces
                                                                             rows="3"  />
                                                                             <app-password-hide-show #psh1 class="password-eye align-items-stretch" [showPassword]="true" (onEyeClick)="togglePasswordType1()"></app-password-hide-show>
                                                                        
@@ -73,16 +73,16 @@
                                                          <div class="row g-3 mb-3">
                                                              <div class="col-md-6">
                                                                 <div class="d-flex align-items-center gap-2">
-                                                                    <label for="ConfirmPassword" class="text-nowrap">
-                                                                        {{ 'ConfirmPassword' | translate }}<span
+                                                                    <label for="confirmPassword" class="text-nowrap">
+                                                                        {{ 'confirmPassword' | translate }}<span
                                                                             class="mandatory">*</span>
                                                                     </label>
                                                                     <div class="password-wrapper position-relative w-100">
-                                                                       <input id="ConfirmPassword"
+                                                                       <input id="confirmPassword"
                                                                             class="form-control"
                                                                             type="{{passwordType2}}"
                                                                             
-                                                                            placeholder="{{ 'ConfirmPassword' | translate }}" appNoWhitespaces/>
+                                                                            placeholder="{{ 'confirmPassword' | translate }}" appNoWhitespaces/>
                                                                             <app-password-hide-show class="password-eye align-items-stretch" #psh2 [showPassword]="true" (onEyeClick)="togglePasswordType2()"></app-password-hide-show>
                                                                         <!-- <div class="text-danger">
                                                                              <div>
diff --git a/src/app/user-management/setup-user/setup-user.component.html b/src/app/user-management/setup-user/setup-user.component.html
index 0143afe..5529e2e 100644
--- a/src/app/user-management/setup-user/setup-user.component.html
+++ b/src/app/user-management/setup-user/setup-user.component.html
@@ -26,16 +26,16 @@
                                                          <div class="row g-3 mb-3">
                                                             <div class="col-md-6">
                                                                 <div class="d-flex align-items-center gap-2">
-                                                                    <label for="UserID" class="text-nowrap">
-                                                                        {{ 'UserID' | translate }}<span
+                                                                    <label for="userID" class="text-nowrap">
+                                                                        {{ 'userID' | translate }}<span
                                                                             class="mandatory">*</span>
                                                                     </label>
                                                                     <div class="password-wrapper position-relative w-100">
                                                                         <div class="d-flex flex-row align-items-stretch">
-                                                                        <input type="text" id="UserID"
+                                                                        <input type="text" id="userID"
                                                                             class="form-control"
                                                                            
-                                                                            placeholder="{{ 'UserID' | translate }}" appNoWhitespaces
+                                                                            placeholder="{{ 'userID' | translate }}" appNoWhitespaces
                                                                             />
                                                                             
                                                                        </div>
@@ -47,18 +47,18 @@
                                                             </div>
                                                             <div class="col-md-6">
                                                                 <div class="d-flex align-items-start gap-2">
-                                                                    <label for="Name"
+                                                                    <label for="name"
                                                                         class="text-nowrap mt-2">
-                                                                        {{ 'Name' | translate }}<span
+                                                                        {{ 'name' | translate }}<span
                                                                             class="mandatory">*</span>
                                                                     </label>
                                                                     <div class="password-wrapper position-relative w-100">
                                                                         
-                                                                            <input id="Name"
+                                                                            <input id="name"
                                                                             class="form-control"
                                                                             
                                                                             maxlength="500"
-                                                                            placeholder="{{ 'Username' | translate }}" appNoWhitespaces
+                                                                            placeholder="{{ 'username' | translate }}" appNoWhitespaces
                                                                             rows="3"  />
                                                                           
                                                                        
@@ -71,15 +71,15 @@
                                                          <div class="row g-3 mb-3">
                                                              <div class="col-md-6">
                                                                 <div class="d-flex align-items-center gap-2">
-                                                                    <label for="PhoneNumber" class="text-nowrap">
-                                                                        {{ 'PhoneNumber' | translate }}<span
+                                                                    <label for="phoneNumber" class="text-nowrap">
+                                                                        {{ 'phoneNumber' | translate }}<span
                                                                             class="mandatory">*</span>
                                                                     </label>
                                                                     <div class="password-wrapper position-relative w-100">
-                                                                       <input id="PhoneNumber"
+                                                                       <input id="phoneNumber"
                                                                             class="form-control"
                                                                                                                                     
-                                                                            placeholder="{{ 'UserContactNumber' | translate }}" appNoWhitespaces/>
+                                                                            placeholder="{{ 'userContactNumber' | translate }}" appNoWhitespaces/>
                                                                             
                                                                         <!-- <div class="text-danger">
                                                                              <div>
@@ -147,9 +147,9 @@
                             <table class="table mb-0 border">
                               <thead class="table-light">
                                 <tr>
-                                  <th>{{'UserID' | translate}}</th>
+                                  <th>{{'userID' | translate}}</th>
                                   <th>{{'Name' | translate}}</th>
-                                  <th>{{'PhoneNumber' | translate}}</th>
+                                  <th>{{'phoneNumber' | translate}}</th>
                                   <th>{{'action' | translate}}</th> 
                                 </tr>
                               </thead>
diff --git a/src/app/user-management/third-party-registration/third-party-registration.component.html b/src/app/user-management/third-party-registration/third-party-registration.component.html
index f3036ce..4b58e35 100644
--- a/src/app/user-management/third-party-registration/third-party-registration.component.html
+++ b/src/app/user-management/third-party-registration/third-party-registration.component.html
@@ -95,7 +95,7 @@
                                                             <div class="col-md-6">
                                                                 <div class="d-flex align-items-center gap-2">
                                                                     <label for="renewalDate" class="text-nowrap">
-                                                                        {{ 'PhoneNumber' | translate }}<span
+                                                                        {{ 'phoneNumber' | translate }}<span
                                                                             class="mandatory">*</span>
                                                                     </label>
                                                                     <div class="d-flex flex-column w-100">
diff --git a/src/assets/i18n/Arabic.json b/src/assets/i18n/Arabic.json
index 4293559..aa451e9 100644
--- a/src/assets/i18n/Arabic.json
+++ b/src/assets/i18n/Arabic.json
@@ -72,11 +72,11 @@
     "smsStatus":"حالة",
     "viewThirdPartyAccounts":"عرض الحسابات",
     "ThirdPartyID":"معرف الحفلة الثالثة",
-    "Name":"اسم",
+    "name":"اسم",
     "EnterThirdPartyName":"أدخل اسم الطرف الثالث",
     "Email":"البريد الإلكتروني",
     "Address":"تبوك",
-    "PhoneNumber":"رقم الهاتف",
+    "phoneNumber":"رقم الهاتف",
     "PhoneNumberPlaceHolder":"أدخل رقم الهاتف",
     "NewNoOfAccounts":"عدد جديد من الحسابات",
     "EnterNewNumberOfAccounts":"أدخل عددًا جديدًا من الحسابات",
@@ -89,16 +89,15 @@
     "gridNum25":"خمسة وعشرون",
     "gridNum50":"خمسون",
     "gridNum100":"مائة",
-    "UserID":"معرف المستخدم",
-    "UserContactNumber":"أدخل رقم اتصال المستخدم",
+    "userID":"معرف المستخدم",
+    "userContactNumber":"أدخل رقم اتصال المستخدم",
     "SelectHomeBranch":"حدد الفرع الرئيسي",
     "SelectRole":"حدد الدور",
     "HomeBranch":"فرع المنزل",
     "Role":"دور",
     "ResetPassword":"إعادة تعيين كلمة المرور",
-    "EnterNewPassword":"أدخل كلمة مرور جديدة",
-    "ConfirmPassword":"تأكيد كلمة المرور",
-    "OldPassword":"كلمة المرور القديمة",
+    "enterNewPassword":"أدخل كلمة مرور جديدة",
+    "oldPassword":"كلمة المرور القديمة",
     "newPasswordStatic":"كلمة السر الجديدة",
     "savePassword":"يحفظ",
     "passwordPattern":"يجب أن تكون كلمة المرور أكثر من 8 أحرف وتتضمن حرفًا كبيرًا وحرفًا صغيرًا ورقمًا وحرفًا خاصًا",
@@ -141,7 +140,6 @@
 	"poc": "POC",
 	"nicop": "S / NICOP",
 	"passport": "جواز السفر",
-    "Previous": "السابق",
     "Next": "التالي",
     "ERR_APP_B_0001": "خطأ خادم داخلي",
 	"ERR_APP_B_0002": "خطأ اتصال محتمل مع الوحدة النمطية {{value1}}",
diff --git a/src/assets/i18n/English.json b/src/assets/i18n/English.json
index d315829..48c0429 100644
--- a/src/assets/i18n/English.json
+++ b/src/assets/i18n/English.json
@@ -1,7 +1,7 @@
 {
 
     "logintoAccount":"Login to your account",
-    "userName":"Username",
+    "username":"Username",
     "userNamePlaceHolder":"Enter Username",
     "password":"Password",
     "passwordPlaceHolder":"Enter Password",
@@ -74,11 +74,11 @@
     "smsStatus":"Status",
     "viewThirdPartyAccounts":"View Accounts",
     "ThirdPartyID":"Third Party ID",
-    "Name":"Name",
+    "name":"Name",
     "EnterThirdPartyName":"Enter Third Party Name",
     "Email":"Email",
     "Address":"Address",
-    "PhoneNumber":"Phone Number",
+    "phoneNumber":"Phone Number",
     "PhoneNumberPlaceHolder":"Enter Phone Number",
     "NewNoOfAccounts":"New No of Accounts",
     "EnterNewNumberOfAccounts":"Enter New Number of Accounts",
@@ -91,15 +91,15 @@
     "gridNum25":"25",
     "gridNum50":"50",
     "gridNum100":"100",
-    "UserID":"User ID",
-    "UserContactNumber":"Enter User Contact Number",
+    "userID":"User ID",
+    "userContactNumber":"Enter User Contact Number",
     "SelectHomeBranch":"Select Home Branch",
     "SelectRole":"Select Role",
     "HomeBranch":"Home Branch",
     "Role":"Role",
     "ResetPassword":"Reset Password",
-    "EnterNewPassword":"Enter New Password",
-    "OldPassword":"Old Password",
+    "enterNewPassword":"Enter New Password",
+    "oldPassword":"Old Password",
     "newPasswordStatic":"New Password",
     "savePassword":"Save",
     "passwordPattern":"Password must be over 8 characters and include an uppercase letter, a lower case letter, a number and a special character",
@@ -144,7 +144,6 @@
 	"passport": "PASSPORT",
     "senderNamePlaceHolder":"Enter Sender Name",
     "senderName":"Sender Name",
-    "Previous": "Previous",
     "Next": "Next",
     "ERR_APP_B_0001":"Internal Server Error",
     "ERR_APP_B_0002":"Possible connection error with {{value1}} module",
@@ -165,7 +164,6 @@
     "emailRequiredError": "Email is required.",
     "invalidEmailFormatError": "Invalid email format.",
     "passNotMatch": "Password does not match",
-
     "POR_ORGACODE": "Organization ID",
     "purposeSetup": "Configure Transaction Purpose",
     "purpcodeLabel": "Purpose Code",