diff --git a/app/auth/forms.py b/app/auth/forms.py
index f05029f..44e8e41 100644
--- a/app/auth/forms.py
+++ b/app/auth/forms.py
@@ -1,6 +1,7 @@
 from flask_wtf import FlaskForm
 from wtforms import StringField, PasswordField, SubmitField, BooleanField
 from wtforms.validators import DataRequired, EqualTo, ValidationError, Length
+from wtforms_validators import NotEqualTo
 from app.models import User
 
 
@@ -14,7 +15,7 @@ class RegistrationForm(FlaskForm):
     username = StringField('Username', validators=[DataRequired(), Length(min=0, max=64)])
     password = PasswordField('Password', validators=[DataRequired(), Length(min=0, max=128)])
     password2 = PasswordField(
-        'Repeat Password', validators=[DataRequired(), EqualTo('password')])
+        'Repeat Password', validators=[DataRequired(), EqualTo('password', 'Field must be equal to Password')])
     submit = SubmitField('Register')
 
     def validate_username(self, username):
@@ -23,17 +24,18 @@ class RegistrationForm(FlaskForm):
             raise ValidationError('Please use a different username.')
 
 class ChangePasswordForm(FlaskForm):
-    old_password = PasswordField('Old Password', validators=[DataRequired(),
-                                                             Length(min=0, max=128)])
-    new_password = PasswordField('New Password', validators=[DataRequired(),
-                                                             Length(min=0, max=128)])
+    old_password = PasswordField('Old Password',
+                                 validators=[DataRequired(), Length(min=0, max=128)])
+    new_password = PasswordField('New Password',
+                                 validators=[DataRequired(), Length(min=0, max=128),
+                                 NotEqualTo('old_password', 'Please choose a new password')])
     new_password2 = PasswordField(
-        'Repeat New Password', validators=[DataRequired(), EqualTo('new_password')])
+        'Repeat New Password', validators=[DataRequired(), EqualTo('new_password', 'Field must be equal to New Password')])
     submit = SubmitField('Apply')
 
 class SetPasswordForm(FlaskForm):
     new_password = PasswordField('New Password', validators=[DataRequired(),
                                                              Length(min=0, max=128)])
     new_password2 = PasswordField(
-        'Repeat New Password', validators=[DataRequired(), EqualTo('new_password')])
+        'Repeat New Password', validators=[DataRequired(), EqualTo('new_password', 'Field must be equal to New Password')])
     submit = SubmitField('Set Password')