diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 858c0789e..9c66bf400 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -1125,6 +1125,7 @@ define(function () {
     out.properties_changePassword = "Modifier le mot de passe";
     out.properties_confirmNew = "Êtes-vous sûr ? Ajouter un mot de passe changera l'URL de ce pad et supprimera son historique. Les utilisateurs ne connaissant pas le nouveau mot de passe perdront l'accès au pad.";
     out.properties_confirmChange = "Êtes-vous sûr ? Changer le mot de passe supprimera l'historique de ce pad. Les utilisateurs ne connaissant pas le nouveau mot de passe perdront l'accès au pad.";
+    out.properties_passwordSame = "Le nouveau mot de passe doit être différent de celui existant.";
     out.properties_passwordError = "Une erreur est survenue lors de la modification du mot de passe. Veuillez réessayer.";
     out.properties_passwordWarning = "Le mot de passe a été modifié avec succès mais nous n'avons pas réussi à mettre à jour votre CryptDrive avec les nouvelles informations. Vous devrez peut-être supprimer manuellement l'ancienne version de ce pad.<br>Appuyez sur OK pour recharger le pad et mettre à jour vos droits d'accès.";
     out.properties_passwordSuccess = "Le mot de passe a été modifié avec succès.<br>Appuyez sur OK pour mettre à jour vos droits d'accès.";
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 4a0b5079c..17daf8ae2 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -1183,6 +1183,7 @@ define(function () {
     out.properties_changePassword = "Change the password";
     out.properties_confirmNew = "Are you sure? Adding a password will change this pad's URL and remove its history. Users without the password will lose access to this pad";
     out.properties_confirmChange = "Are you sure? Changing the password will remove its history. Users without the new password will lose access to this pad";
+    out.properties.passwordSame = "New passwords must differ from the current one.";
     out.properties_passwordError = "An error occured while trying to change the password. Please try again.";
     out.properties_passwordWarning = "The password was successfully changed but we were unable to update your CryptDrive with the new data. You may have to remove the old version of the pad manually.<br>Press OK to reload and update your acces rights.";
     out.properties_passwordSuccess = "The password was successfully changed.<br>Press OK to reload and update your access rights.";
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index d54540efa..16b45c4f8 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -147,7 +147,7 @@ define([
             id: 'cp-app-prop-expire',
         }));
 
-        var hasPassword = typeof data.password !== "undefined";
+        var hasPassword = data.password;
         if (hasPassword) {
             $('<label>', {'for': 'cp-app-prop-password'}).text(Messages.creation_passwordValue)
                 .appendTo($d);
@@ -183,23 +183,31 @@ define([
                 passwordOk
             ]);
             $(passwordOk).click(function () {
+                var newPass = $(newPassword).find('input').val();
+                if (data.password === newPass ||
+                    (!data.password && !newPass)) {
+                    return void UI.alert(Messages.properties_passwordSame);
+                }
                 UI.confirm(changePwConfirm, function (yes) {
                     if (!yes) { return; }
                     sframeChan.query("Q_PAD_PASSWORD_CHANGE", {
                         href: data.href,
-                        password: $(newPassword).find('input').val()
+                        password: newPass
                     }, function (err, data) {
                         if (err || data.error) {
                             return void UI.alert(Messages.properties_passwordError);
                         }
                         UI.findOKButton().click();
+                        // If we didn't have a password, we have to add the /p/
+                        // If we had a password and we changed it to a new one, we just have to reload
+                        // If we had a password and we removed it, we have to remove the /p/
                         if (data.warning) {
                             return void UI.alert(Messages.properties_passwordWarning, function () {
-                                common.gotoURL(hasPassword ? undefined : data.href);
+                                common.gotoURL(hasPassword && newPass ? undefined : data.href);
                             }, {force: true});
                         }
                         return void UI.alert(Messages.properties_passwordSuccess, function () {
-                            common.gotoURL(hasPassword ? undefined : data.href);
+                            common.gotoURL(hasPassword && newPass ? undefined : data.href);
                         }, {force: true});
                     });
                 });
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index d33f2e28a..6b203eead 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -622,10 +622,17 @@ define([
         var warning = false;
         var newHash;
         var oldChannel;
-        if (parsed.hashData.password) {
-            newHash = parsed.hash;
+        var newSecret;
+
+        if (parsed.hashData.version >= 2) {
+            newSecret = Hash.getSecrets(parsed.type, parsed.hash, newPassword);
+            if (!(newSecret.keys && newSecret.keys.editKeyStr)) {
+                return void cb({error: 'EAUTH'});
+            }
+            newHash = Hash.getEditHashFromKeys(newSecret);
         } else {
             newHash = Hash.createRandomHash(parsed.type, newPassword);
+            newSecret = Hash.getSecrets(parsed.type, newHash, newPassword);
         }
         var newHref = '/' + parsed.type + '/#' + newHash;
 
@@ -677,16 +684,17 @@ define([
                     return void cb(obj);
                 }
             }));
+            common.unpinPads([oldChannel], waitFor());
+            common.pinPads([newSecret.channel], waitFor());
         }).nThen(function (waitFor) {
             common.setPadAttribute('password', newPassword, waitFor(function (err) {
                 if (err) { warning = true; }
             }), href);
-            var secret = Hash.getSecrets(parsed.type, newHash, newPassword);
-            common.setPadAttribute('channel', secret.channel, waitFor(function (err) {
+            common.setPadAttribute('channel', newSecret.channel, waitFor(function (err) {
                 if (err) { warning = true; }
             }), href);
 
-            if (parsed.hashData.password) { return; } // same hash
+            if (parsed.hashData.password && newPassword) { return; } // same hash
             common.setPadAttribute('href', newHref, waitFor(function (err) {
                 if (err) { warning = true; }
             }), href);