diff --git a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
index 82dcf820a..a444abe12 100644
--- a/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
+++ b/src/main/java/pm/axe/ui/pages/user/RegistrationPage.java
@@ -263,6 +263,7 @@ private void onRegister(final ClickEvent<Button> event) {
         } else {
             //username
             if (isUsernameInvalid(userEmailInput)) {
+                //error message is already set by validator.
                 return;
             }
         }
@@ -270,12 +271,14 @@ private void onRegister(final ClickEvent<Button> event) {
         //username
         if (isUsernameInputVisible()) {
             if (isUsernameInvalid(usernameInput)) {
+                //error message is already set by validator.
                 return;
             }
         }
 
         //password
         if (fieldsValidationUtils.isPasswordInvalid(passwordInput)) {
+            //error message is already set by validator.
             return;
         }
 
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
index eaa64f668..c25f61af1 100644
--- a/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
+++ b/src/main/java/pm/axe/ui/pages/user/profile/tabs/SecurityTab.java
@@ -1,6 +1,7 @@
 package pm.axe.ui.pages.user.profile.tabs;
 
 import com.vaadin.flow.component.AbstractField;
+import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.checkbox.Checkbox;
@@ -22,27 +23,29 @@
 import pm.axe.db.models.UserSettings;
 import pm.axe.internal.HasTabInit;
 import pm.axe.services.user.AccountService;
+import pm.axe.services.user.UserService;
 import pm.axe.services.user.UserSettingsService;
 import pm.axe.ui.elements.PasswordGenerator;
 import pm.axe.ui.elements.Section;
 import pm.axe.users.AccountType;
-import pm.axe.utils.AppUtils;
-import pm.axe.utils.AxeSessionUtils;
-import pm.axe.utils.ErrorUtils;
-import pm.axe.utils.VaadinUtils;
+import pm.axe.utils.*;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import static pm.axe.utils.VaadinUtils.onInvalidInput;
+
 @SuppressWarnings("DuplicatedCode")
 @RequiredArgsConstructor
 @SpringComponent
 @UIScope
 public class SecurityTab extends VerticalLayout implements HasTabInit {
     private final AccountService accountService;
+    private final UserService userService;
     private final UserSettingsService userSettingsService;
     private final AxeSessionUtils axeSessionUtils;
+    private final FieldsValidationUtils fieldsValidationUtils;
 
     private List<Account> confirmedAccounts;
 
@@ -50,6 +53,9 @@ public class SecurityTab extends VerticalLayout implements HasTabInit {
     private Section resetPasswordChannelSection;
     private Section tfaSection;
 
+    private PasswordField oldPasswordInput;
+    private PasswordField newPasswordInput;
+
     private Select<String> resetPasswordSelect;
 
     private Checkbox tfaBox;
@@ -86,14 +92,20 @@ private Section createChangePasswordSection() {
     }
 
     private VerticalLayout createChangePasswordContent() {
-        PasswordField oldPasswordInput = new PasswordField("Old Password");
-        PasswordField newPasswordInput = new PasswordField("New Password");
+        oldPasswordInput = new PasswordField("Old Password");
+
+        newPasswordInput = new PasswordField("New Password");
+        newPasswordInput.addValueChangeListener(this::onPasswordChanged);
+
         PasswordGenerator passwordGenerator = PasswordGenerator.create();
         passwordGenerator.setOpened(false);
         passwordGenerator.setCopyTarget(newPasswordInput);
+
         Button updatePasswordButton = new Button("Update");
+        updatePasswordButton.addClickListener(this::onPasswordUpdate);
         updatePasswordButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
         updatePasswordButton.setWidthFull();
+
         VerticalLayout changePasswordLayout = new VerticalLayout(oldPasswordInput, newPasswordInput,
                 passwordGenerator, updatePasswordButton);
         changePasswordLayout.setPadding(false);
@@ -197,6 +209,47 @@ private VerticalLayout createTfaContent() {
         return tfaContent;
     }
 
+    private void onPasswordChanged(final AbstractField.ComponentValueChangeEvent<PasswordField, String> event) {
+        boolean isPasswordValid = !fieldsValidationUtils.isPasswordInvalid(newPasswordInput);
+        if (isPasswordValid) {
+            newPasswordInput.setInvalid(false);
+            newPasswordInput.setErrorMessage("");
+        }
+    }
+
+    private void onPasswordUpdate(final ClickEvent<Button> event) {
+        final String oldPassword = oldPasswordInput.getValue();
+        final String newPassword = newPasswordInput.getValue();
+        if (StringUtils.isBlank(oldPassword)) {
+            onInvalidInput(oldPasswordInput, "Old Password cannot be blank");
+            return;
+        }
+
+        if (StringUtils.isBlank(newPassword)) {
+            onInvalidInput(newPasswordInput, "New Password cannot be blank");
+            return;
+        }
+
+        final boolean isNewPasswordInvalid = fieldsValidationUtils.isPasswordInvalid(newPasswordInput);
+        if (isNewPasswordInvalid) {
+            //error message is already set by validator.
+            return;
+        }
+
+        final boolean isOldPasswordValid = userService.checkPassword(user, oldPassword.trim());
+        if (!isOldPasswordValid) {
+            onInvalidInput(oldPasswordInput, "Old Password is incorrect, try again");
+            return;
+        }
+
+        //all field are valid - let's change password
+        doPasswordChange();
+    }
+
+    private void doPasswordChange() {
+        AppUtils.showSuccessNotification("Will do once implemented");
+    }
+
     private void onResetPasswordSelectModified(final AbstractField.ComponentValueChangeEvent<Select<String>, String> event) {
         AccountType selectedAccountType = AccountType.valueOf(resetPasswordSelect.getValue());
         if (selectedAccountType != AccountType.LOCAL) {