diff --git a/app/coffee/modules/user-settings/change-password.coffee b/app/coffee/modules/user-settings/change-password.coffee
index 4f38b575..a08acb8c 100644
--- a/app/coffee/modules/user-settings/change-password.coffee
+++ b/app/coffee/modules/user-settings/change-password.coffee
@@ -63,9 +63,14 @@ module.controller("UserChangePasswordController", UserChangePasswordController)
 
 UserChangePasswordDirective = ($rs, $confirm, $loading, $translate) ->
     link = ($scope, $el, $attrs, ctrl) ->
+        form = new checksley.Form($el.find("form"))
+
         submit = debounce 2000, (event) =>
             event.preventDefault()
 
+            if not form.validate()
+                return
+
             if $scope.newPassword1 != $scope.newPassword2
                 $confirm.notify('error', $translate.instant("CHANGE_PASSWORD.ERROR_PASSWORD_MATCH"))
                 return
diff --git a/app/partials/user/user-change-password.jade b/app/partials/user/user-change-password.jade
index 5b5e0b5d..60d7eaf1 100644
--- a/app/partials/user/user-change-password.jade
+++ b/app/partials/user/user-change-password.jade
@@ -17,6 +17,7 @@ div.wrapper(
             fieldset
                 label(for="current-password", translate="CHANGE_PASSWORD.FIELD_CURRENT_PASSWORD")
                 input(
+                    data-required="true"
                     type="password"
                     name="password"
                     id="current-password"
@@ -28,6 +29,7 @@ div.wrapper(
             fieldset
                 label(for="new-password", translate="CHANGE_PASSWORD.FIELD_NEW_PASSWORD")
                 input(
+                    data-required="true"
                     type="password"
                     name="new-password"
                     id="new-password"
@@ -39,6 +41,7 @@ div.wrapper(
             fieldset
                 label(for="retype-password", translate="CHANGE_PASSWORD.FIELD_RETYPE_PASSWORD")
                 input(
+                    data-required="true"
                     type="password"
                     name="retype-password"
                     id="retype-password"