diff --git a/media/js/settings.js b/media/js/settings.js
index da230883edcbbeceaa117962e64799de6519c3bb..7b64dd7e038c4a944834c3bd151e485cb88baf49 100644
--- a/media/js/settings.js
+++ b/media/js/settings.js
@@ -75,12 +75,12 @@ function onSettingsPopup() {
         var pConfirm = $inputPwdConfirm.val();
         var pNew = $inputPwdNew.val();
 
-        if (pCurrent === '') {
+        if (pCurrent.length < 5) {
             $inputPwdCurrent.focus();
             return;
         }
 
-        if (pNew === '') {
+        if (pNew.length < 5) {
             $inputPwdNew.focus();
             return;
         }
@@ -106,7 +106,7 @@ function onSettingsPopup() {
                     $changePassBut.text('Ошибка!').addClass('Error').removeAttr('disabled');
                 }
 
-                $inputPwdCurrent
+                $inputPwdCurrent.focus()
                     .add($inputPwdConfirm)
                     .add($inputPwdNew)
                     .val('');