diff --git a/src/main/java/core/basesyntax/PasswordValidationException.java b/src/main/java/core/basesyntax/PasswordValidationException.java
index c9e7ed3e7..42905b8c7 100644
--- a/src/main/java/core/basesyntax/PasswordValidationException.java
+++ b/src/main/java/core/basesyntax/PasswordValidationException.java
@@ -1,3 +1,16 @@
 package core.basesyntax;
 
 //write your code here
+public class PasswordValidationException extends Exception {
+    /**
+     * Constructs a new exception with the specified detail message.  The
+     * cause is not initialized, and may subsequently be initialized by
+     * a call to {@link #initCause}.
+     *
+     * @param message the detail message. The detail message is saved for
+     *                later retrieval by the {@link #getMessage()} method.
+     */
+    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..1943bb013 100644
--- a/src/main/java/core/basesyntax/PasswordValidator.java
+++ b/src/main/java/core/basesyntax/PasswordValidator.java
@@ -1,7 +1,12 @@
 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 || !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 52f08d130..de6bc6f69 100644
--- a/src/main/java/core/basesyntax/UserService.java
+++ b/src/main/java/core/basesyntax/UserService.java
@@ -1,8 +1,20 @@
 package core.basesyntax;
 
 public class UserService {
+    private final PasswordValidator validator = new PasswordValidator();
+
     public void registerUser(User user) {
         //write your code here
+        if (user == null) {
+            System.out.println("User cannot be null");
+            return;
+        }
+        try {
+            validator.validate(user.getPassword(), user.getRepeatPassword());
+            saveUser(user);
+        } catch (PasswordValidationException e) {
+            System.out.println("Your passwords are incorrect. Try again.");
+        }
     }
 
     public void saveUser(User user) {