diff --git a/skins/base/views/molecules/ChangePassword.js b/skins/base/views/molecules/ChangePassword.js
index 98b2e71bce..969a43d8fd 100644
--- a/skins/base/views/molecules/ChangePassword.js
+++ b/skins/base/views/molecules/ChangePassword.js
@@ -35,6 +35,11 @@ module.exports = React.createClass({
                 state: this.Phases.Error,
                 errorString: "Passwords don't match"
             });
+        } else if (new_password == '' || old_password == '') {
+            this.setState({
+                state: this.Phases.Error,
+                errorString: "Passwords can't be empty"
+            });
         } else {
             this.changePassword(old_password, new_password);
         }