diff --git a/eform-client/src/app/modules/account-management/components/profile/profile-settings/profile-settings.component.html b/eform-client/src/app/modules/account-management/components/profile/profile-settings/profile-settings.component.html
index 60e7c49798..42b1d6ad2d 100644
--- a/eform-client/src/app/modules/account-management/components/profile/profile-settings/profile-settings.component.html
+++ b/eform-client/src/app/modules/account-management/components/profile/profile-settings/profile-settings.component.html
@@ -11,7 +11,7 @@
   </div>
 </eform-new-subheader>
 
-<div class="d-flex flex-row justify-content-between align-items-start">
+<div [formGroup]="profileForm" class="d-flex flex-row justify-content-between align-items-start">
   <mat-card class="p-3" *ngIf="selectCurrentUserIsAdmin$ | async">
     <mat-card-header>
       <mat-card-title>{{ 'Google Authenticator' | translate }}</mat-card-title>
@@ -19,8 +19,8 @@
     <div class="mb-1">
       <mat-checkbox
         id="2fauthForsed"
-        (change)="isTwoFactorEnabledCheckBoxChanged($event)"
-        [(ngModel)]="googleAuthInfoModel.isTwoFactorEnabled"
+        formControlName="isTwoFactorEnabled"
+        (change)="toggleTwoFactor()"
         color="primary">
         {{ 'Status' | translate }}
       </mat-checkbox>
@@ -128,7 +128,7 @@
         [bindLabel]="'name'"
         [bindValue]="'languageCode'"
         [clearable]="false"
-        [(ngModel)]="userSettingsModel.locale"
+        formControlName="locale"
         [items]="activeLanguages">
       </mtx-select>
     </mat-form-field>
@@ -139,7 +139,7 @@
         [bindLabel]="'text'"
         [bindValue]="'id'"
         [clearable]="false"
-        [(ngModel)]="userSettingsModel.formats"
+        formControlName="formats"
         [items]="countries">
       </mtx-select>
     </mat-form-field>
@@ -150,14 +150,14 @@
         [bindLabel]="'name'"
         [bindValue]="'id'"
         [clearable]="false"
-        [(ngModel)]="userSettingsModel.timeZone"
+        formControlName="timeZone"
         [items]="timeZones.timeZoneModels">
       </mtx-select>
     </mat-form-field>
     <div class="mb-1">
       <mat-checkbox
         id="darkTheme"
-        [(ngModel)]="userSettingsModel.darkTheme">
+        formControlName="darkTheme">
         {{ 'Dark theme' | translate }}
       </mat-checkbox>
     </div>
diff --git a/eform-client/src/app/modules/account-management/components/profile/profile-settings/profile-settings.component.ts b/eform-client/src/app/modules/account-management/components/profile/profile-settings/profile-settings.component.ts
index eaa2239811..0838e5c93e 100644
--- a/eform-client/src/app/modules/account-management/components/profile/profile-settings/profile-settings.component.ts
+++ b/eform-client/src/app/modules/account-management/components/profile/profile-settings/profile-settings.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit, inject } from '@angular/core';
+import { FormBuilder, FormGroup, FormControl } from '@angular/forms';
 import { GoogleAuthInfoModel } from 'src/app/common/models/auth';
 import { UserSettingsModel } from 'src/app/common/models/settings';
 import {
@@ -32,6 +33,7 @@ import * as R from 'ramda';
     standalone: false
 })
 export class ProfileSettingsComponent implements OnInit {
+  private fb = inject(FormBuilder);
   authStateService = inject(AuthStateService);
   private authStore = inject(Store);
   private googleAuthService = inject(GoogleAuthService);
@@ -55,6 +57,14 @@ export class ProfileSettingsComponent implements OnInit {
   public selectCurrentUserIsAdmin$ = this.authStore.select(selectCurrentUserIsAdmin);
   private selectBearerToken$ = this.authStore.select(selectBearerToken);
 
+  profileForm: FormGroup = this.fb.group({
+    locale: new FormControl(''),
+    formats: new FormControl(''),
+    timeZone: new FormControl(''),
+    darkTheme: new FormControl(false),
+    isTwoFactorEnabled: new FormControl(false),
+  });
+
   ngOnInit() {
     this.getEnabledLanguages();
     this.initializeUploaders();
@@ -94,12 +104,25 @@ export class ProfileSettingsComponent implements OnInit {
     });
   }
 
-  isTwoFactorEnabledCheckBoxChanged(e) {
-    if (e.target) {
-      this.googleAuthInfoModel.isTwoFactorEnabled = e.target.checked;
-    } else {
-      return;
-    }
+  // isTwoFactorEnabledCheckBoxChanged(e) {
+  //   if (e.target) {
+  //     this.googleAuthInfoModel.isTwoFactorEnabled = e.target.checked;
+  //   } else {
+  //     return;
+  //   }
+  //   this.googleAuthService
+  //     .updateGoogleAuthenticatorInfo(this.googleAuthInfoModel)
+  //     .subscribe((data) => {
+  //       if (data.success) {
+  //         this.authStateService.logout();
+  //       }
+  //     });
+  // }
+
+  toggleTwoFactor(): void {
+    const isEnabled = this.profileForm.get('isTwoFactorEnabled')?.value;
+    this.googleAuthInfoModel.isTwoFactorEnabled = isEnabled;
+
     this.googleAuthService
       .updateGoogleAuthenticatorInfo(this.googleAuthInfoModel)
       .subscribe((data) => {
@@ -117,41 +140,106 @@ export class ProfileSettingsComponent implements OnInit {
     });
   }
 
+  // deleteGoogleAuthenticatorInfo() {
+  //   this.googleAuthService.deleteGoogleAuthenticatorInfo().subscribe((data) => {
+  //     if (data && data.success) {
+  //       this.googleAuthInfoModel.psk = null;
+  //     }
+  //   });
+  // }
+
+  // updateUserProfileSettings() {
+  //
+  //   if (this.profilePictureUploader.queue.length > 0) {
+  //     this.profilePictureUploader.queue[0].upload();
+  //   }
+  //   this.userSettingsService
+  //     .updateUserSettings(this.userSettingsModel)
+  //     .subscribe((data) => {
+  //       this.userSettings.getUserSettings().subscribe((data) => {
+  //         this.userSettingsModel = data.model;
+  //         this.store.dispatch(updateCurrentUserLocaleAndDarkTheme({
+  //           darkTheme: this.userSettingsModel.darkTheme,
+  //           locale: this.userSettingsModel.locale,
+  //           languageId: this.userSettingsModel.languageId
+  //         }));
+  //         this.getUserSettings();
+  //       });
+  //       this.store.dispatch(loadAppMenu());
+  //     });
+  // }
+
   updateUserProfileSettings() {
+    const formValue = this.profileForm.value;
+
+    this.userSettingsModel.locale = formValue.locale;
+    this.userSettingsModel.formats = formValue.formats;
+    this.userSettingsModel.timeZone = formValue.timeZone;
+    this.userSettingsModel.darkTheme = formValue.darkTheme;
 
     if (this.profilePictureUploader.queue.length > 0) {
       this.profilePictureUploader.queue[0].upload();
     }
-    this.userSettingsService
-      .updateUserSettings(this.userSettingsModel)
-      .subscribe((data) => {
-        this.userSettings.getUserSettings().subscribe((data) => {
-          this.userSettingsModel = data.model;
-          this.store.dispatch(updateCurrentUserLocaleAndDarkTheme({
+
+    this.userSettingsService.updateUserSettings(this.userSettingsModel).subscribe((data) => {
+      this.userSettings.getUserSettings().subscribe((data) => {
+        this.userSettingsModel = data.model;
+        this.store.dispatch(
+          updateCurrentUserLocaleAndDarkTheme({
             darkTheme: this.userSettingsModel.darkTheme,
             locale: this.userSettingsModel.locale,
-            languageId: this.userSettingsModel.languageId
-          }));
-          this.getUserSettings();
-        });
-        this.store.dispatch(loadAppMenu());
+            languageId: this.userSettingsModel.languageId,
+          })
+        );
+        this.getUserSettings();
       });
+      this.store.dispatch(loadAppMenu());
+    });
   }
 
+  // getEnabledLanguages() {
+  //   this.getLanguagesSub$ = this.appSettingsStateService.getLanguages()
+  //     .pipe(tap(data => {
+  //       if (data && data.success && data.model) {
+  //         this.appLanguages = data.model;
+  //         this.activeLanguages = this.appLanguages.languages.filter((x) => x.isActive);
+  //         this.getTimeZones();
+  //         this.getGoogleAuthenticatorInfo();
+  //         this.getUserSettings();
+  //       }
+  //     }))
+  //     .subscribe();
+  // }
+
   getEnabledLanguages() {
     this.getLanguagesSub$ = this.appSettingsStateService.getLanguages()
-      .pipe(tap(data => {
-        if (data && data.success && data.model) {
-          this.appLanguages = data.model;
-          this.activeLanguages = this.appLanguages.languages.filter((x) => x.isActive);
-          this.getTimeZones();
-          this.getGoogleAuthenticatorInfo();
-          this.getUserSettings();
-        }
-      }))
+      .pipe(
+        tap((data) => {
+          if (data && data.success && data.model) {
+            this.appLanguages = data.model;
+            this.activeLanguages = this.appLanguages.languages.filter((x) => x.isActive);
+            this.getTimeZones();
+            this.getGoogleAuthenticatorInfo();
+
+            // Fetch user settings after languages are available
+            this.userSettingsService.getUserSettings().subscribe((data) => {
+              this.userSettingsModel = data.model;
+
+              this.profileForm.patchValue({
+                locale: this.userSettingsModel.locale,
+                formats: this.userSettingsModel.formats,
+                timeZone: this.userSettingsModel.timeZone,
+                darkTheme: this.userSettingsModel.darkTheme,
+                isTwoFactorEnabled: this.googleAuthInfoModel.isTwoFactorEnabled,
+              });
+            });
+          }
+        })
+      )
       .subscribe();
   }
 
+
   get languages() {
     return this.appLanguages.languages.filter((x) => x.isActive);
   }
diff --git a/eform-client/src/app/modules/account-management/components/users/user-modal/user-modal.component.html b/eform-client/src/app/modules/account-management/components/users/user-modal/user-modal.component.html
index f66dece436..25ea61990d 100644
--- a/eform-client/src/app/modules/account-management/components/users/user-modal/user-modal.component.html
+++ b/eform-client/src/app/modules/account-management/components/users/user-modal/user-modal.component.html
@@ -1,16 +1,16 @@
 <h3 mat-dialog-title>{{ (edit ? 'Edit User' : 'New User') | translate }}</h3>
 <div mat-dialog-content>
-  <form #form="ngForm" class="need-wrapper">
+  <form #form="ngForm" [formGroup]="userForm" class="need-wrapper">
     <div class="d-flex flex-row">
       <mat-form-field>
         <mat-label>{{ 'First name' | translate }}</mat-label>
         <input
-        matInput
-        type="text"
-        [disabled]="userModel.isDeviceUser"
-        [(ngModel)]="userModel.firstName"
-        [id]="edit ? 'editFirstName' : 'createFirstName'"
-        [name]="edit ? 'editFirstName' : 'createFirstName'"
+          matInput
+          type="text"
+          [disabled]="isDeviceUser"
+          formControlName="firstName"
+          [id]="edit ? 'editFirstName' : 'createFirstName'"
+          [name]="edit ? 'editFirstName' : 'createFirstName'"
         >
       </mat-form-field>
       <mat-form-field>
@@ -18,8 +18,8 @@ <h3 mat-dialog-title>{{ (edit ? 'Edit User' : 'New User') | translate }}</h3>
         <input
           matInput
           type="text"
-          [disabled]="userModel.isDeviceUser"
-          [(ngModel)]="userModel.lastName"
+          [disabled]="isDeviceUser"
+          formControlName="lastName"
           [name]="edit ? 'editLastName' : 'createLastName'"
           [id]="edit ? 'editLastName' : 'createLastName'"
         >
@@ -31,9 +31,8 @@ <h3 mat-dialog-title>{{ (edit ? 'Edit User' : 'New User') | translate }}</h3>
         <input
           matInput
           required
-          #createEmail="ngModel"
-          type="text"
-          [(ngModel)]="userModel.email"
+          type="email"
+          formControlName="email"
           [id]="edit ? 'emailEdit' : 'createEmail'"
           [name]="edit ? 'emailEdit' : 'createEmail'"
         >
@@ -44,7 +43,7 @@ <h3 mat-dialog-title>{{ (edit ? 'Edit User' : 'New User') | translate }}</h3>
           matInput
           required
           type="password"
-          [(ngModel)]="userModel.password"
+          formControlName="password"
           [id]="edit ? 'editPassword' : 'createPassword'"
           [name]="edit ? 'editPassword' : 'createPassword'"
         >
@@ -58,8 +57,7 @@ <h3 mat-dialog-title>{{ (edit ? 'Edit User' : 'New User') | translate }}</h3>
           bindLabel="name"
           bindValue="id"
           [clearable]="false"
-          [(ngModel)]="userModel.role"
-          [name]="edit ? 'editRole' : 'createRole'"
+          formControlName="role"
           [id]="edit ? 'editRole' : 'createRole'"
           id="createRole"
           appendTo="body"
@@ -69,14 +67,13 @@ <h3 mat-dialog-title>{{ (edit ? 'Edit User' : 'New User') | translate }}</h3>
                   ]"
         ></mtx-select>
       </mat-form-field>
-      <mat-form-field *ngIf="userModel.role !== 'admin'">
+      <mat-form-field *ngIf="userForm.get('role')?.value !== 'admin'">
         <mat-label>{{ 'Group' | translate }}</mat-label>
         <mtx-select
           required
           bindLabel="groupName"
           bindValue="id"
-          [(ngModel)]="userModel.groupId"
-          [name]="edit ? 'editGroup' : 'createGroup'"
+          formControlName="groupId"
           [id]="edit ? 'editGroup' : 'createGroup'"
           appendTo="body"
           [items]="availableGroups.entities"
@@ -87,11 +84,11 @@ <h3 mat-dialog-title>{{ (edit ? 'Edit User' : 'New User') | translate }}</h3>
 </div>
 <div mat-dialog-actions class="d-flex flex-row justify-content-end">
   <button
-    [disabled]="!form.form.valid"
     mat-raised-button
     color="accent"
     type="submit"
-    (click)="edit ? updateUser() : createUser()"
+    [disabled]="userForm.invalid"
+    (click)="submit()"
     [id]="edit ? 'editUserSaveBtn' : 'createAdministrationUserBtn'"
   >
     {{ (edit ? 'Save' : 'Create') | translate }}
diff --git a/eform-client/src/app/modules/account-management/components/users/user-modal/user-modal.component.ts b/eform-client/src/app/modules/account-management/components/users/user-modal/user-modal.component.ts
index e018496ff5..dc0d43bda7 100644
--- a/eform-client/src/app/modules/account-management/components/users/user-modal/user-modal.component.ts
+++ b/eform-client/src/app/modules/account-management/components/users/user-modal/user-modal.component.ts
@@ -1,64 +1,121 @@
-import { Component, EventEmitter, Input, OnInit, Output, inject } from '@angular/core';
-import { Paged } from 'src/app/common/models/common';
-import { SecurityGroupModel } from 'src/app/common/models/security';
-import { UserRegisterModel } from 'src/app/common/models/user';
-import { AdminService } from 'src/app/common/services/users';
+import {Component, EventEmitter, Input, OnInit, Output, inject} from '@angular/core';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
+import {Paged} from 'src/app/common/models/common';
+import {SecurityGroupModel} from 'src/app/common/models/security';
+import {UserRegisterModel} from 'src/app/common/models/user';
+import {AdminService} from 'src/app/common/services/users';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 
 @Component({
-    selector: 'app-user-modal',
-    templateUrl: './user-modal.component.html',
-    styleUrls: ['./user-modal.component.scss'],
-    standalone: false
+  selector: 'app-user-modal',
+  templateUrl: './user-modal.component.html',
+  styleUrls: ['./user-modal.component.scss'],
+  standalone: false
 })
 export class UserModalComponent implements OnInit {
+  private fb = inject(FormBuilder);
   private adminService = inject(AdminService);
   dialogRef = inject<MatDialogRef<UserModalComponent>>(MatDialogRef);
-
-  userModel: UserRegisterModel = new UserRegisterModel();
+  userForm: FormGroup;
   public availableGroups: Paged<SecurityGroupModel> = new Paged<SecurityGroupModel>();
   edit: boolean = false;
+  selectedId?: number;
+  isDeviceUser = false;
 
   constructor() {
-    const data = inject<{
-    availableGroups: Paged<SecurityGroupModel>;
-    selectedId?: number;
-}>(MAT_DIALOG_DATA);
-
+    const data = inject<{ availableGroups: Paged<SecurityGroupModel>; selectedId?: number }>(MAT_DIALOG_DATA);
     this.availableGroups = data.availableGroups;
-    if(data.selectedId) {
+    this.selectedId = data.selectedId;
+
+    this.userForm = this.fb.group({
+      firstName: ['', Validators.required],
+      lastName: ['', Validators.required],
+      email: ['', [Validators.required, Validators.email]],
+      password: [''],
+      role: ['user', Validators.required],
+      groupId: [null, Validators.required]
+    });
+
+    if (data.selectedId) {
       this.edit = true;
-      this.getUserInfo(data.selectedId);
+      this.loadUser(data.selectedId);
     }
   }
 
-  ngOnInit() {}
+  ngOnInit() {
+    if (this.edit) {
+      this.userForm.get('password')?.clearValidators();
+      this.userForm.get('password')?.updateValueAndValidity();
+    } else {
+      this.userForm.get('password')?.setValidators(Validators.required);
+      this.userForm.get('password')?.updateValueAndValidity();
+    }
+    this.userForm.get('password')?.updateValueAndValidity();
 
-  createUser() {
-    this.adminService.createUser(this.userModel).subscribe((data) => {
-      if (data && data.success) {
-        this.hide(true);
+    this.userForm.get('role')?.valueChanges.subscribe((role) => {
+      const groupControl = this.userForm.get('groupId');
+      if (role === 'admin') {
+        groupControl?.clearValidators();
+        groupControl?.setValue(null);
+      } else {
+        groupControl?.setValidators(Validators.required);
       }
+      groupControl?.updateValueAndValidity();
     });
+
   }
 
-  getUserInfo(selectedId: number) {
+  loadUser(selectedId: number) {
     this.adminService.getUser(selectedId).subscribe((data) => {
       if (data && data.model) {
-        this.userModel = data.model;
+        const user = data.model;
+        this.userForm.patchValue({
+          firstName: user.firstName,
+          lastName: user.lastName,
+          email: user.email,
+          role: user.role,
+          groupId: user.groupId
+        });
+
+        if (user.isDeviceUser) {
+          this.isDeviceUser = true;
+        }
+
+        if (user.role === 'admin') {
+          const groupControl = this.userForm.get('groupId');
+          groupControl?.clearValidators();
+          groupControl?.updateValueAndValidity();
+        }
       }
     });
   }
 
-  updateUser() {
-    this.adminService.updateUser(this.userModel).subscribe((data) => {
-      if (data && data.success) {
-        this.hide(true);
-      }
-    });
+  submit() {
+    if (this.userForm.invalid) {
+      return;
+    }
+
+    const formValue = this.userForm.value;
+    const model = new UserRegisterModel();
+    Object.assign(model, formValue);
+
+    if (this.edit && this.selectedId) {
+      model.id = this.selectedId;
+      this.adminService.updateUser(model).subscribe((data) => {
+        if (data && data.success) {
+          this.hide(true);
+        }
+      });
+    } else {
+      this.adminService.createUser(model).subscribe((data) => {
+        if (data && data.success) {
+          this.hide(true);
+        }
+      });
+    }
   }
 
   hide(result = false) {
-    this.dialogRef.close({result: result, edit: this.edit});
+    this.dialogRef.close({result, edit: this.edit});
   }
 }
diff --git a/eform-client/src/app/modules/account-management/components/users/user-set-password-modal/user-set-password.component.html b/eform-client/src/app/modules/account-management/components/users/user-set-password-modal/user-set-password.component.html
index 64acfeec41..42694c9ff9 100644
--- a/eform-client/src/app/modules/account-management/components/users/user-set-password-modal/user-set-password.component.html
+++ b/eform-client/src/app/modules/account-management/components/users/user-set-password-modal/user-set-password.component.html
@@ -1,76 +1,91 @@
-<h3 mat-dialog-title>{{'Set user password' | translate}}</h3>
+<h3 mat-dialog-title>{{ 'Set user password' | translate }}</h3>
 <div mat-dialog-content>
   <div class="d-flex flex-row justify-content-between">
     <div class="d-flex flex-column">
       <p>ID</p>
     </div>
     <div class="d-flex flex-column">
-      <strong>{{selectedUser.id}}</strong>
+      <strong>{{ selectedUser.id }}</strong>
     </div>
   </div>
   <div class="d-flex flex-row justify-content-between">
     <div class="d-flex flex-column">
-      <p>{{'Email' | translate}}</p>
+      <p>{{ 'Email' | translate }}</p>
     </div>
     <div class="d-flex flex-column">
       <strong>{{ selectedUser.email }}</strong>
     </div>
   </div>
   <form [formGroup]="setPasswordForm">
-  <mat-form-field>
-    <mat-label>{{ 'New password' | translate }}</mat-label>
-    <input
-      matInput
-      [type]="newPasswordVisible ? 'text' : 'password'"
-      name="newPassword"
-      formControlName="newPassword"
-      required
-      id="newPassword"
-      autocomplete="new-password"
-    />
-    <mat-icon
-      matSuffix
-      (click)="toggleNewPasswordVisibility()"
-      style="cursor: pointer;"
-      [attr.aria-label]="'Toggle password visibility'"
-    >
-      {{newPasswordVisible ? 'visibility_off' : 'visibility'}}
-    </mat-icon>
-  </mat-form-field>
+    <mat-form-field>
+      <mat-label>{{ 'New password' | translate }}</mat-label>
+      <input
+        matInput
+        [type]="newPasswordVisible ? 'text' : 'password'"
+        name="newPassword"
+        formControlName="newPassword"
+        required
+        id="newPassword"
+        autocomplete="new-password"
+      />
+      <mat-icon
+        matSuffix
+        (click)="toggleNewPasswordVisibility()"
+        style="cursor: pointer;"
+        [attr.aria-label]="'Toggle password visibility'"
+      >
+        {{ newPasswordVisible ? 'visibility_off' : 'visibility' }}
+      </mat-icon>
+      <mat-error *ngIf="setPasswordForm.get('newPassword')?.hasError('required')">
+        {{ 'Password is required' | translate }}
+      </mat-error>
+      <mat-error *ngIf="setPasswordForm.get('newPassword')?.hasError('minlength')">
+        {{ 'Password must be at least 8 characters' | translate }}
+      </mat-error>
+      <mat-error *ngIf="setPasswordForm.get('newPassword')?.hasError('weakPassword')">
+        {{ 'Password is too weak' | translate }}
+      </mat-error>
+    </mat-form-field>
 
-  <!-- Password Strength Meter -->
-  <mat-password-strength 
-    [password]="setPasswordForm.get('newPassword')?.value || ''"
-    [enableLengthRule]="true"
-    [enableLowerCaseLetterRule]="true" 
-    [enableUpperCaseLetterRule]="true"
-    [enableDigitRule]="true"
-    [enableSpecialCharRule]="false"
-    [min]="8"
-    [max]="50"
-    (onStrengthChanged)="onPasswordStrengthChanged($event)">
-  </mat-password-strength>
+    <!-- Password Strength Meter -->
+    <mat-password-strength
+      [password]="setPasswordForm.get('newPassword')?.value || ''"
+      [enableLengthRule]="true"
+      [enableLowerCaseLetterRule]="true"
+      [enableUpperCaseLetterRule]="true"
+      [enableDigitRule]="true"
+      [enableSpecialCharRule]="false"
+      [min]="8"
+      [max]="50"
+      (onStrengthChanged)="onPasswordStrengthChanged($event)">
+    </mat-password-strength>
 
-  <mat-form-field>
-    <mat-label>{{ 'New password confirmation' | translate }}</mat-label>
-    <input
-      matInput
-      [type]="confirmPasswordVisible ? 'text' : 'password'"
-      formControlName="confirmPassword"
-      required
-      id="newPasswordConfirmation"
-      name="newPasswordConfirmation"
-      autocomplete="new-password"
-    />
-    <mat-icon
-      matSuffix
-      (click)="toggleConfirmPasswordVisibility()"
-      style="cursor: pointer;"
-      [attr.aria-label]="'Toggle password visibility'"
-    >
-      {{confirmPasswordVisible ? 'visibility_off' : 'visibility'}}
-    </mat-icon>
-  </mat-form-field>
+    <mat-form-field>
+      <mat-label>{{ 'New password confirmation' | translate }}</mat-label>
+      <input
+        matInput
+        [type]="confirmPasswordVisible ? 'text' : 'password'"
+        formControlName="confirmPassword"
+        required
+        id="newPasswordConfirmation"
+        name="newPasswordConfirmation"
+        autocomplete="new-password"
+      />
+      <mat-icon
+        matSuffix
+        (click)="toggleConfirmPasswordVisibility()"
+        style="cursor: pointer;"
+        [attr.aria-label]="'Toggle password visibility'"
+      >
+        {{ confirmPasswordVisible ? 'visibility_off' : 'visibility' }}
+      </mat-icon>
+      <mat-error *ngIf="setPasswordForm.get('confirmPassword')?.hasError('required')">
+        {{ 'Password confirmation is required' | translate }}
+      </mat-error>
+      <mat-error *ngIf="setPasswordForm.get('confirmPassword')?.hasError('mismatch')">
+        {{ 'Passwords do not match' | translate }}
+      </mat-error>
+    </mat-form-field>
   </form>
 </div>
 <div mat-dialog-actions class="d-flex flex-row justify-content-end">
@@ -79,15 +94,15 @@ <h3 mat-dialog-title>{{'Set user password' | translate}}</h3>
     color="warn"
     id="userDeleteBtn"
     (click)="setPassword()"
-    [disabled]="!valid"
+    [disabled]="setPasswordForm.invalid"
   >
-    {{'Save' | translate}}
+    {{ 'Save' | translate }}
   </button>
   <button
     mat-raised-button
     id="userDeleteCancelBtn"
     (click)="hide()"
   >
-    {{'Cancel' | translate}}
+    {{ 'Cancel' | translate }}
   </button>
 </div>
diff --git a/eform-client/src/app/modules/account-management/components/users/user-set-password-modal/user-set-password.component.ts b/eform-client/src/app/modules/account-management/components/users/user-set-password-modal/user-set-password.component.ts
index 724787d77d..6efb278542 100644
--- a/eform-client/src/app/modules/account-management/components/users/user-set-password-modal/user-set-password.component.ts
+++ b/eform-client/src/app/modules/account-management/components/users/user-set-password-modal/user-set-password.component.ts
@@ -1,14 +1,14 @@
-import { Component, EventEmitter, OnInit, inject } from '@angular/core';
+import {Component, EventEmitter, OnInit, inject} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 import {UserInfoModel} from 'src/app/common/models';
-import {FormBuilder, FormGroup, Validators} from '@angular/forms';
+import {FormBuilder, FormGroup, Validators, AbstractControl} from '@angular/forms';
 import {AuthService} from 'src/app/common/services';
 import {ChangePasswordAdminModel} from 'src/app/common/models/user/change-password-admin.model';
 
 @Component({
-    selector: 'app-user-set-password',
-    templateUrl: './user-set-password.component.html',
-    standalone: false
+  selector: 'app-user-set-password',
+  templateUrl: './user-set-password.component.html',
+  standalone: false
 })
 export class UserSetPasswordComponent implements OnInit {
   private authService = inject(AuthService);
@@ -24,12 +24,17 @@ export class UserSetPasswordComponent implements OnInit {
   passwordStrength = 0; // Track password strength score
   constructor() {
     this.setPasswordForm = this.fb.group({
-      newPassword: ['', [Validators.minLength(8)]],
-      confirmPassword: ['', [Validators.minLength(8)]]
-    });
+        newPassword: ['', [Validators.minLength(8)]],
+        confirmPassword: ['', [Validators.minLength(8)]]
+      },
+      {validators: this.passwordMatchValidator}
+    );
   }
 
   ngOnInit() {
+    this.setPasswordForm.get('newPassword')?.valueChanges.subscribe(() => {
+      this.setPasswordForm.get('confirmPassword')?.updateValueAndValidity({ onlySelf: true });
+    });
   }
 
   hide() {
@@ -40,12 +45,14 @@ export class UserSetPasswordComponent implements OnInit {
     this.changePasswordModel = this.setPasswordForm.getRawValue();
     this.changePasswordModel.email = this.selectedUser.email;
     this.authService.changePasswordAdmin(this.changePasswordModel).subscribe(
-      (data) => {},
+      (data) => {
+      },
     );
     this.userPasswordSet.emit(this.selectedUser);
   }
-  get valid(){
-    if(this.setPasswordForm) {
+
+  get valid() {
+    if (this.setPasswordForm) {
       return this.setPasswordForm.valid;
     }
     return false;
@@ -61,15 +68,27 @@ export class UserSetPasswordComponent implements OnInit {
 
   onPasswordStrengthChanged(strength: number): void {
     this.passwordStrength = strength;
-    // Optionally add additional validation based on strength
     const passwordControl = this.setPasswordForm.get('newPassword');
-    if (passwordControl && strength < 40) {
-      passwordControl.setErrors({ ...passwordControl.errors, weakPassword: true });
-    } else if (passwordControl && passwordControl.hasError('weakPassword')) {
-      delete passwordControl.errors.weakPassword;
-      if (Object.keys(passwordControl.errors).length === 0) {
-        passwordControl.setErrors(null);
+    if (passwordControl) {
+      if (strength < 40) {
+        passwordControl.setErrors({...passwordControl.errors, weakPassword: true});
+      } else if (passwordControl.hasError('weakPassword')) {
+        delete passwordControl.errors.weakPassword;
+        if (Object.keys(passwordControl.errors || {}).length === 0) {
+          passwordControl.setErrors(null);
+        }
       }
     }
   }
+
+  private passwordMatchValidator(group: AbstractControl): { [key: string]: boolean } | null {
+    const password = group.get('newPassword')?.value;
+    const confirm = group.get('confirmPassword')?.value;
+    if (password && confirm && password !== confirm) {
+      group.get('confirmPassword')?.setErrors({mismatch: true});
+      return {mismatch: true};
+    } else {
+      return null;
+    }
+  }
 }
diff --git a/eform-client/src/app/modules/plugins-management/components/installed/installed-plugin-permissions/installed-plugin-permissions.component.html b/eform-client/src/app/modules/plugins-management/components/installed/installed-plugin-permissions/installed-plugin-permissions.component.html
index c9567852bb..6bdae733c8 100644
--- a/eform-client/src/app/modules/plugins-management/components/installed/installed-plugin-permissions/installed-plugin-permissions.component.html
+++ b/eform-client/src/app/modules/plugins-management/components/installed/installed-plugin-permissions/installed-plugin-permissions.component.html
@@ -1,18 +1,20 @@
-<h3 mat-dialog-title>{{'Plugin permissions' | translate}}</h3>
-<div mat-dialog-content>
+<h3 mat-dialog-title>{{ 'Plugin permissions' | translate }}</h3>
+
+<div mat-dialog-content [formGroup]="permissionsForm">
   <div class="flex-wrap d-flex flex-row" *ngIf="pluginGroupPermissions">
     <mat-card *ngFor="let groupPermissions of pluginGroupPermissions" class="m-2">
       <mat-card-header>
-        <h3>{{getSecurityGroupName(groupPermissions.groupId)}}</h3>
+        <h3>{{ getSecurityGroupName(groupPermissions.groupId) }}</h3>
       </mat-card-header>
       <mat-card-content>
         <ng-container *ngFor="let permission of groupPermissions.permissions">
           <div class="d-flex flex-column">
             <mat-checkbox
+              class="mb-2"
+              [formControlName]="getPermissionControlName(groupPermissions.groupId, permission.permissionId)"
               id="perm_{{groupPermissions.groupId}}_{{permission.permissionId}}"
-              [(ngModel)]="permission.isEnabled"
-              class="mb-2">
-              {{permission.permissionName | translate}}
+            >
+              {{ permission.permissionName | translate }}
             </mat-checkbox>
           </div>
         </ng-container>
@@ -27,13 +29,13 @@ <h3>{{getSecurityGroupName(groupPermissions.groupId)}}</h3>
     (click)="updatePluginPermissions()"
     id="saveBtn"
   >
-    {{'Save' | translate}}
+    {{ 'Save' | translate }}
   </button>
   <button
     mat-raised-button
     (click)="hide()"
     id="cancelCreateBtn"
   >
-    {{'Cancel' | translate}}
+    {{ 'Cancel' | translate }}
   </button>
 </div>
diff --git a/eform-client/src/app/modules/plugins-management/components/installed/installed-plugin-permissions/installed-plugin-permissions.component.ts b/eform-client/src/app/modules/plugins-management/components/installed/installed-plugin-permissions/installed-plugin-permissions.component.ts
index c77845f3b3..4e733a3946 100644
--- a/eform-client/src/app/modules/plugins-management/components/installed/installed-plugin-permissions/installed-plugin-permissions.component.ts
+++ b/eform-client/src/app/modules/plugins-management/components/installed/installed-plugin-permissions/installed-plugin-permissions.component.ts
@@ -1,51 +1,85 @@
-import { Component, OnInit, inject } from '@angular/core';
+import {Component, OnInit, inject} from '@angular/core';
 import {
   PluginGroupPermissionsListModel,
   PluginGroupPermissionsUpdateModel,
   SecurityGroupModel,
 } from 'src/app/common/models';
+import {FormBuilder, FormGroup, FormControl} from '@angular/forms';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 import {PluginPermissionsService} from 'src/app/common/services';
 
 @Component({
-    selector: 'app-installed-plugin-permissions',
-    templateUrl: './installed-plugin-permissions.component.html',
-    styleUrls: ['./installed-plugin-permissions.component.scss'],
-    standalone: false
+  selector: 'app-installed-plugin-permissions',
+  templateUrl: './installed-plugin-permissions.component.html',
+  styleUrls: ['./installed-plugin-permissions.component.scss'],
+  standalone: false,
 })
+
 export class InstalledPluginPermissionsComponent implements OnInit {
   private pluginPermissionsService = inject(PluginPermissionsService);
+  private fb = inject(FormBuilder);
   dialogRef = inject<MatDialogRef<InstalledPluginPermissionsComponent>>(MatDialogRef);
 
   securityGroups: SecurityGroupModel[] = [];
   pluginGroupPermissions: PluginGroupPermissionsListModel[] = [];
   pluginId: number;
+  permissionsForm: FormGroup = this.fb.group({});
 
   constructor() {
     const model = inject<{
-    pluginPermissions: PluginGroupPermissionsUpdateModel;
-    securityGroups: SecurityGroupModel[];
-}>(MAT_DIALOG_DATA);
+      pluginPermissions: PluginGroupPermissionsUpdateModel;
+      securityGroups: SecurityGroupModel[];
+    }>(MAT_DIALOG_DATA);
 
     this.pluginId = model.pluginPermissions.pluginId;
     this.pluginGroupPermissions = model.pluginPermissions.groupPermissions;
     this.securityGroups = model.securityGroups;
   }
 
-  ngOnInit() {}
+  ngOnInit() {
+    this.initializeForm();
+  }
+
+  private initializeForm() {
+    const controls: { [key: string]: FormControl } = {};
+
+    this.pluginGroupPermissions.forEach(group => {
+      group.permissions.forEach(permission => {
+        const controlName = this.getPermissionControlName(group.groupId, permission.permissionId);
+        controls[controlName] = new FormControl(permission.isEnabled);
+      });
+    });
+
+    this.permissionsForm = this.fb.group(controls);
+  }
+
+  getPermissionControlName(groupId: number, permissionId: number): string {
+    return `perm_${groupId}_${permissionId}`;
+  }
 
   hide(result = false) {
     this.dialogRef.close(result);
   }
 
   getSecurityGroupName(id: number) {
-    const group = this.securityGroups.find((g) => g.id === id);
+    const group = this.securityGroups.find(g => g.id === id);
     return group ? group.groupName : '';
   }
 
   updatePluginPermissions() {
+
+    this.pluginGroupPermissions.forEach(group => {
+      group.permissions.forEach(permission => {
+        const controlName = this.getPermissionControlName(group.groupId, permission.permissionId);
+        permission.isEnabled = this.permissionsForm.get(controlName)?.value ?? false;
+      });
+    });
+
     this.pluginPermissionsService
-      .updatePluginGroupPermissions({pluginId: this.pluginId, groupPermissions: this.pluginGroupPermissions})
+      .updatePluginGroupPermissions({
+        pluginId: this.pluginId,
+        groupPermissions: this.pluginGroupPermissions,
+      })
       .subscribe((data) => {
         if (data && data.success) {
           this.hide(true);
diff --git a/eform-client/src/app/modules/plugins-management/plugins-management.module.ts b/eform-client/src/app/modules/plugins-management/plugins-management.module.ts
index 6d4038eede..da684bd23a 100644
--- a/eform-client/src/app/modules/plugins-management/plugins-management.module.ts
+++ b/eform-client/src/app/modules/plugins-management/plugins-management.module.ts
@@ -1,6 +1,6 @@
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {FormsModule} from '@angular/forms';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {TranslateModule} from '@ngx-translate/core';
 import {EformSharedModule} from '../../common/modules/eform-shared/eform-shared.module';
 import {PluginsManagementRouting} from './plugins-management.routing';
@@ -21,21 +21,22 @@ import {MatDialogModule} from '@angular/material/dialog';
 import {MatCardModule} from '@angular/material/card';
 
 @NgModule({
-  imports: [
-    CommonModule,
-    EformSharedModule,
-    FormsModule,
-    TranslateModule,
-    PluginsManagementRouting,
-    MatCheckboxModule,
-    MatButtonModule,
-    MtxGridModule,
-    MatSlideToggleModule,
-    MatTooltipModule,
-    MatIconModule,
-    MatDialogModule,
-    MatCardModule,
-  ],
+    imports: [
+        CommonModule,
+        EformSharedModule,
+        FormsModule,
+        TranslateModule,
+        PluginsManagementRouting,
+        MatCheckboxModule,
+        MatButtonModule,
+        MtxGridModule,
+        MatSlideToggleModule,
+        MatTooltipModule,
+        MatIconModule,
+        MatDialogModule,
+        MatCardModule,
+        ReactiveFormsModule,
+    ],
   declarations: [
     InstalledPluginsPageComponent,
     InstalledPluginModalComponent,