diff --git a/src/main/java/core/basesyntax/PasswordValidationException.java b/src/main/java/core/basesyntax/PasswordValidationException.java
index 70c1d49fd..762d7bdca 100644
--- a/src/main/java/core/basesyntax/PasswordValidationException.java
+++ b/src/main/java/core/basesyntax/PasswordValidationException.java
@@ -4,4 +4,5 @@ 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 e581bafd9..4b7850138 100644
--- a/src/main/java/core/basesyntax/PasswordValidator.java
+++ b/src/main/java/core/basesyntax/PasswordValidator.java
@@ -1,12 +1,12 @@
 package core.basesyntax;
 
 public class PasswordValidator {
-    public static final int MIN_VALUE_FOR_PASSWORD = 10;
+    public static final int MIN_PASSWORD_LENGTH = 10;
 
     public void validate(String password, String repeatPassword)
             throws PasswordValidationException {
-        if (password != repeatPassword || password.length() < MIN_VALUE_FOR_PASSWORD
-                || password == null || repeatPassword == null) {
+        if (password == null || repeatPassword == null
+                || !password.equals(repeatPassword) || password.length() < MIN_PASSWORD_LENGTH) {
             throw new PasswordValidationException("Wrong passwords");
         }
     }
diff --git a/src/main/java/core/basesyntax/UserService.java b/src/main/java/core/basesyntax/UserService.java
index e2dcd1aa3..b4da0e860 100644
--- a/src/main/java/core/basesyntax/UserService.java
+++ b/src/main/java/core/basesyntax/UserService.java
@@ -3,7 +3,7 @@
 public class UserService {
     private PasswordValidator passwordValidator = new PasswordValidator();
 
-    public void registerUser(User user) throws PasswordValidationException {
+    public void registerUser(User user) {
         try {
             passwordValidator.validate(user.getPassword(), user.getRepeatPassword());
             saveUser(user);