diff --git a/settings/js/personal.js b/settings/js/personal.js
index aad57224388a6f5f15e1f6a4f800975d25b46e12..ad3fb706fd0600dc1995d30cad4040ddbbe0a4f9 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -25,7 +25,8 @@ $(document).ready(function(){
 			});
 			return false;
 		} else {
-			$('passworderror').show();
+			$('#passwordchanged').hide();
+			$('#passworderror').show();
 			return false;
 		}
 
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 4629c93b90e0810b3d20a619b9d2d542ff912918..4198892649e1298b0c53edbd4b143d10c9ea9206 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -11,7 +11,7 @@
 <form id="passwordform">
 	<fieldset class="personalblock">
 		<div id="passwordchanged"><?php echo $l->t('Your password got changed');?></div>
-		<div id="passworderror"></div>
+		<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
 		<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" />
 		<input type="password" id="pass2" name="password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#show" />
 		<input type="checkbox" id="show" name="show" /><label for="show"><?php echo $l->t('show');?></label>