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 a051b13..d47125e 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
@@ -48,89 +48,81 @@
                         ></i>
                       </button>
                     </div> -->
-                    <div class="form-group position-relative">
-                      <label for="newPass" style="color: #ffffff"
-                        >New Password</label
-                      >
-                      <input
-                        [type]="showNewPass ? 'text' : 'password'"
-                        id="newPass"
-                        class="form-control"
-                        formControlName="newPass"
-                        maxlength="20"
-                        placeholder="********"
-                        [ngClass]="{
-                          'is-invalid': submitted && f.newPass.errors
-                        }"
-                      />
+                    <div class="form-group">
+                      <label for="newPass" style="color: #ffffff">New Password</label>
+                      <div class="input-group">
+                        <input
+                          [type]="showNewPass ? 'text' : 'password'"
+                          id="newPass"
+                          class="form-control"
+                          formControlName="newPass"
+                          maxlength="20"
+                          placeholder="********"
+                          [ngClass]="{
+                            'is-invalid': submitted && f.newPass.errors
+                          }"
+                        />
+                        <div class="input-group-append">
+                          <button
+                            type="button"
+                            class="btn btn-link"
+                            (click)="toggleNewPassVisibility()"
+                            style="color: #c3f164 !important;"
+                          >
+                            <i [class]="showNewPass ? 'fa fa-eye-slash' : 'fa fa-eye'"></i>
+                          </button>
+                        </div>
+                      </div>
                       <small
                         class="form-text text-muted danger"
                         *ngIf="submitted && f.newPass.errors"
                         class="invalid-feedback"
                       >
-                        <div *ngIf="f.newPass.errors.required">
-                          New Password is required
-                        </div>
+                        <div *ngIf="f.newPass.errors.required">New Password is required</div>
                         <div *ngIf="f.newPass.errors.minlength">
                           New Password must be at least 8 characters long
                         </div>
                         <div *ngIf="f.newPass.errors.pattern">
-                          New Password must contain at least one uppercase
-                          letter, one lowercase letter, and one number
+                          New Password must contain at least one uppercase letter, one lowercase letter, and one number
                         </div>
                       </small>
-                      <button
-                        type="button"
-                        class="btn btn-link position-absolute"
-                        (click)="toggleNewPassVisibility()"
-                        style="top: 30px; right: 10px; color: #c3f164 !important;"
-                      >
-                        <i
-                          [class]="
-                            showNewPass ? 'fa fa-eye-slash' : 'fa fa-eye'
-                          "
-                        ></i>
-                      </button>
                     </div>
-                    <div class="form-group position-relative">
-                      <label for="confirmPass" style="color: #ffffff"
-                        >Confirm Password</label
-                      >
-                      <input
-                        [type]="showConfirmPass ? 'text' : 'password'"
-                        id="confirmPass"
-                        class="form-control"
-                        formControlName="confirmPass"
-                        maxlength="20"
-                        placeholder="********"
-                        [ngClass]="{
-                          'is-invalid': submitted && f.confirmPass.errors
-                        }"
-                      />
+                    
+                    <div class="form-group">
+                      <label for="confirmPass" style="color: #ffffff">Confirm Password</label>
+                      <div class="input-group">
+                        <input
+                          [type]="showConfirmPass ? 'text' : 'password'"
+                          id="confirmPass"
+                          class="form-control"
+                          formControlName="confirmPass"
+                          maxlength="20"
+                          placeholder="********"
+                          [ngClass]="{
+                            'is-invalid': submitted && f.confirmPass.errors
+                          }"
+                        />
+                        <div class="input-group-append">
+                          <button
+                            type="button"
+                            class="btn btn-link"
+                            (click)="toggleConfirmPassVisibility()"
+                            style="color: #c3f164 !important;"
+                          >
+                            <i [class]="showConfirmPass ? 'fa fa-eye-slash' : 'fa fa-eye'"></i>
+                          </button>
+                        </div>
+                      </div>
                       <small
                         class="form-text text-muted danger"
                         *ngIf="submitted && f.confirmPass.errors"
                         class="invalid-feedback"
                       >
-                        <div *ngIf="f.confirmPass.errors.required">
-                          Confirm Password is required
-                        </div>
+                        <div *ngIf="f.confirmPass.errors.required">Confirm Password is required</div>
                         <div *ngIf="f.confirmPass.errors.matchPassword">
                           Confirm Password must match the New Password
                         </div>
                       </small>
-                      <button
-                        type="button"
-                        class="btn btn-link position-absolute"
-                        (click)="toggleConfirmPassVisibility()"
-                        style="top: 30px; right: 10px; color: #c3f164 !important;"
-                      >
-                        <i
-                          [class]="
-                            showConfirmPass ? 'fa fa-eye-slash' : 'fa fa-eye'
-                          "
-                        ></i>
-                      </button>
                     </div>
                   </div>
                 </div>
diff --git a/src/app/interceptors/http-error-interceptor.service.ts b/src/app/interceptors/http-error-interceptor.service.ts
index 921b80a..9615774 100644
--- a/src/app/interceptors/http-error-interceptor.service.ts
+++ b/src/app/interceptors/http-error-interceptor.service.ts
@@ -26,10 +26,10 @@ export class HttpErrorInterceptorService {
           });
           // this.router.navigate(['/error/error404']);
         } else if (error.status === 500) {
-          this.toastr.error("Error", error.message, {
-            timeOut: 3000,
-            closeButton: true,
-          });
+          // this.toastr.error("Error", error.message, {
+          //   timeOut: 3000,
+          //   closeButton: true,
+          // });
           // this.router.navigate(['/error/error500']);
         } else if (error.status === 502) {
           this.toastr.error("Error", error.message, {
diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts
index 37f5a7d..da6067d 100644
--- a/src/app/login/login.component.ts
+++ b/src/app/login/login.component.ts
@@ -96,6 +96,7 @@ export class LoginComponent implements OnInit {
         this.router.navigate(["/monitoring"]);
       },
       (error) => {
+        this.submitted = false;
         this.toastr.error("Error", "Akun yang anda masukan salah!", {
           timeOut: 5000,
           closeButton: true,