diff --git a/src/main/java/core/basesyntax/PasswordValidationException.java b/src/main/java/core/basesyntax/PasswordValidationException.java
index c9e7ed3e7..70c1d49fd 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
+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 d4655c9f5..33711f0b1 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) {
-        //write your code here
+    public void validate(String password, String repeatPassword)
+            throws PasswordValidationException {
+        if (password == null || repeatPassword == null || password.length() < 10
+                || repeatPassword.length() < 10
+                || !password.equals(repeatPassword)) {
+            throw new PasswordValidationException("Wrong passwords");
+        }
     }
 }
diff --git a/src/main/java/core/basesyntax/User.java b/src/main/java/core/basesyntax/User.java
index e702946a8..fd0fad7e7 100644
--- a/src/main/java/core/basesyntax/User.java
+++ b/src/main/java/core/basesyntax/User.java
@@ -12,26 +12,32 @@ public User(String email, String password, String repeatPassword) {
     }
 
     public String getEmail() {
+
         return email;
     }
 
     public void setEmail(String email) {
+
         this.email = email;
     }
 
     public String getPassword() {
+
         return password;
     }
 
     public void setPassword(String password) {
+
         this.password = password;
     }
 
     public String getRepeatPassword() {
+
         return repeatPassword;
     }
 
     public void setRepeatPassword(String repeatPassword) {
+
         this.repeatPassword = repeatPassword;
     }
 
diff --git a/src/main/java/core/basesyntax/UserService.java b/src/main/java/core/basesyntax/UserService.java
index 52f08d130..70454b28e 100644
--- a/src/main/java/core/basesyntax/UserService.java
+++ b/src/main/java/core/basesyntax/UserService.java
@@ -2,10 +2,17 @@
 
 public class UserService {
     public void registerUser(User user) {
-        //write your code here
+        PasswordValidator validator = new PasswordValidator();
+        try {
+            validator.validate(user.getPassword(), user.getRepeatPassword());
+            saveUser(user);
+        } catch (Exception e) {
+            System.out.println("Your passwords are incorrect. Try again.");
+        }
     }
 
     public void saveUser(User user) {
+
         System.out.println("User " + user.toString() + " was saved to database!!!");
     }
 }