diff --git a/src/main/java/core/basesyntax/PasswordValidationException.java b/src/main/java/core/basesyntax/PasswordValidationException.java
index c9e7ed3e..01e2b9e4 100644
--- a/src/main/java/core/basesyntax/PasswordValidationException.java
+++ b/src/main/java/core/basesyntax/PasswordValidationException.java
@@ -1,3 +1,7 @@
-package core.basesyntax;
-
-//write your code here
+package core.basesyntax;
+
+public class PasswordValidationException extends Exception {
+    public PasswordValidationException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/core/basesyntax/PasswordValidator.java b/src/main/java/core/basesyntax/PasswordValidator.java
index d4655c9f..6e4a2dcb 100644
--- a/src/main/java/core/basesyntax/PasswordValidator.java
+++ b/src/main/java/core/basesyntax/PasswordValidator.java
@@ -1,7 +1,14 @@
 package core.basesyntax;
 
 public class PasswordValidator {
-    public void validate(String password, String repeatPassword) {
-        //write your code here
+    public void validate(String password, String repeatPassword)
+            throws PasswordValidationException {
+
+        if (repeatPassword == null
+                || password == null
+                || !password.equals(repeatPassword)
+                || password.length() < 10) {
+            throw new PasswordValidationException("Wrong passwords");
+        }
     }
 }
diff --git a/src/main/java/core/basesyntax/UserService.java b/src/main/java/core/basesyntax/UserService.java
index 52f08d13..b29abacc 100644
--- a/src/main/java/core/basesyntax/UserService.java
+++ b/src/main/java/core/basesyntax/UserService.java
@@ -2,10 +2,21 @@
 
 public class UserService {
     public void registerUser(User user) {
-        //write your code here
+
+        PasswordValidator passwordValidator = new PasswordValidator();
+
+        try {
+            passwordValidator.validate(user.getPassword(), user.getRepeatPassword());
+        } catch (PasswordValidationException e) {
+            System.out.println("Your passwords are incorrect. Try again.");
+            return;
+        }
+
+        saveUser(user);
     }
 
     public void saveUser(User user) {
+
         System.out.println("User " + user.toString() + " was saved to database!!!");
     }
 }