diff --git a/src/app/content/hemat-app/user-profile/profil-information/profil-information.component.html b/src/app/content/hemat-app/user-profile/profil-information/profil-information.component.html
index dcbed6a..f730f02 100644
--- a/src/app/content/hemat-app/user-profile/profil-information/profil-information.component.html
+++ b/src/app/content/hemat-app/user-profile/profil-information/profil-information.component.html
@@ -15,6 +15,7 @@
                   id="firstName"
                   class="form-control"
                   formControlName="firstName"
+                  maxlength="20"
                   placeholder="John Vander"
                   [ngClass]="{
                     'is-invalid': submitted && f.firstName.errors
@@ -37,6 +38,7 @@
                   id="lastName"
                   class="form-control"
                   formControlName="lastName"
+                  maxlength="20"
                   placeholder="John Vander"
                   [ngClass]="{
                     'is-invalid': submitted && f.lastName.errors
@@ -60,6 +62,7 @@
                   class="form-control"
                   formControlName="email"
                   placeholder="email@email.com"
+                  maxlength="50"
                   [ngClass]="{
                     'is-invalid': submitted && f.email.errors
                   }"
@@ -79,6 +82,7 @@
                   id="phone"
                   class="form-control"
                   formControlName="phone"
+                  maxlength="13"
                   placeholder="08**************"
                   [ngClass]="{
                     'is-invalid': submitted && f.phone.errors
diff --git a/src/app/content/hemat-app/user-profile/update-password/update-password.component.html b/src/app/content/hemat-app/user-profile/update-password/update-password.component.html
index 2fee70f..a051b13 100644
--- a/src/app/content/hemat-app/user-profile/update-password/update-password.component.html
+++ b/src/app/content/hemat-app/user-profile/update-password/update-password.component.html
@@ -11,7 +11,7 @@
               <div class="form-body">
                 <div class="row">
                   <div class="col-md-12">
-                    <div class="form-group position-relative">
+                    <!-- <div class="form-group position-relative">
                       <label for="currentPass" style="color: #ffffff"
                         >Current Password</label
                       >
@@ -20,6 +20,7 @@
                         id="currentPass"
                         class="form-control"
                         formControlName="currentPass"
+                        maxlength="20"
                         placeholder="********"
                         [ngClass]="{
                           'is-invalid': submitted && f.currentPass.errors
@@ -46,7 +47,7 @@
                           "
                         ></i>
                       </button>
-                    </div>
+                    </div> -->
                     <div class="form-group position-relative">
                       <label for="newPass" style="color: #ffffff"
                         >New Password</label
@@ -56,6 +57,7 @@
                         id="newPass"
                         class="form-control"
                         formControlName="newPass"
+                        maxlength="20"
                         placeholder="********"
                         [ngClass]="{
                           'is-invalid': submitted && f.newPass.errors
@@ -99,6 +101,7 @@
                         id="confirmPass"
                         class="form-control"
                         formControlName="confirmPass"
+                        maxlength="20"
                         placeholder="********"
                         [ngClass]="{
                           'is-invalid': submitted && f.confirmPass.errors
diff --git a/src/app/content/hemat-app/user-profile/update-password/update-password.component.ts b/src/app/content/hemat-app/user-profile/update-password/update-password.component.ts
index b75b8ce..ccb99de 100644
--- a/src/app/content/hemat-app/user-profile/update-password/update-password.component.ts
+++ b/src/app/content/hemat-app/user-profile/update-password/update-password.component.ts
@@ -42,7 +42,7 @@ export class UpdatePasswordComponent {
     this.storedData = JSON.parse(localStorage.getItem("account_info"));
     this.profilInfo = this.formBuilder.group({
       userid: this.storedData.sub,
-      currentPass: ["", Validators.required],
+      currentPass: [""],
       newPass: [
         "",
         [
@@ -99,7 +99,7 @@ export class UpdatePasswordComponent {
   cancel() {
     this.profilInfo = this.formBuilder.group({
       userid: this.storedData.sub,
-      currentPass: ["", Validators.required],
+      currentPass: [""],
       newPass: [
         "",
         [