diff --git a/src/main/java/core/basesyntax/PasswordValidationException.java b/src/main/java/core/basesyntax/PasswordValidationException.java
index c9e7ed3e7..6849b58a0 100644
--- a/src/main/java/core/basesyntax/PasswordValidationException.java
+++ b/src/main/java/core/basesyntax/PasswordValidationException.java
@@ -1,3 +1,9 @@
 package core.basesyntax;
 
-//write your code here
+class PasswordValidationException extends Exception {
+    //write your code here
+    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 d4655c9f5..07f2952dc 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) {
+    public void validate(String password, String repeatPassword)
+            throws PasswordValidationException {
         //write your code here
+        if (password == null || repeatPassword == null) {
+            throw new PasswordValidationException("Wrong passwords");
+        }
+        if (password.length() < 10 || !password.equals(repeatPassword)) {
+            throw new PasswordValidationException("Wrong passwords");
+        }
     }
 }
diff --git a/src/main/java/core/basesyntax/UserService.java b/src/main/java/core/basesyntax/UserService.java
index 52f08d130..971277794 100644
--- a/src/main/java/core/basesyntax/UserService.java
+++ b/src/main/java/core/basesyntax/UserService.java
@@ -3,6 +3,12 @@
 public class UserService {
     public void registerUser(User user) {
         //write your code here
+        try {
+            new PasswordValidator().validate(user.getPassword(), user.getRepeatPassword());
+            saveUser(user);
+        } catch (PasswordValidationException e) {
+            System.out.println("Your passwords are incorrect. Try again.");
+        }
     }
 
     public void saveUser(User user) {