diff --git a/www/code/inner.html b/www/code/inner.html
index b80598df7..106430ec0 100644
--- a/www/code/inner.html
+++ b/www/code/inner.html
@@ -10,6 +10,7 @@
     <script src="codemirror-5.16.0/mode/javascript/javascript.js"></script>
     <script src="codemirror-5.16.0/mode/loadmode.js"></script>
     <script src="codemirror-5.16.0/mode/meta.js"></script>
+    <script src="codemirror-5.16.0/addon/mode/overlay.js"></script>
     <script src="codemirror-5.16.0/addon/edit/closebrackets.js"></script>
     <script src="codemirror-5.16.0/addon/edit/matchbrackets.js"></script>
     <script src="codemirror-5.16.0/addon/edit/trailingspace.js"></script>
diff --git a/www/code/main.js b/www/code/main.js
index a97020be5..51814cfe4 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -445,7 +445,6 @@ define([
 
                 var lastName = getLastName();
                 if (typeof(lastName) === 'string' && lastName.length) {
-                    console.log("Setting previous name to %s", lastName);
                     setName(lastName);
                 }
             };
diff --git a/www/pad/main.js b/www/pad/main.js
index dfdf3f9cb..166b3ab24 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -234,21 +234,32 @@ define([
                 myID = info.myID || null;
             };
 
+            var getLastName = function () {
+                return Cryptpad.getPadAttribute('username') || '';
+            };
+
+            var setName = module.setName = function (newName) {
+                if (!(typeof(newName) === 'string' && newName.trim())) { return; }
+                var myUserNameTemp = newName.trim();
+                if(myUserNameTemp.length > 32) {
+                    myUserNameTemp = myUserNameTemp.substr(0, 32);
+                }
+                myUserName = myUserNameTemp;
+                myData[myID] = {
+                    name: myUserName
+                };
+                addToUserList(myData);
+                editor.fire('change');
+
+                Cryptpad.setPadAttribute('username', newName);
+            };
+
             var createChangeName = function(id, $container) {
                 var buttonElmt = $container.find('#'+id)[0];
+                var lastName = getLastName();
                 buttonElmt.addEventListener("click", function() {
-                    Cryptpad.prompt(Messages.changeNamePrompt, '', function (newName) {
-                        if (!(typeof(newName) === 'string' && newName.trim())) { return; }
-                        var myUserNameTemp = newName.trim();
-                        if(myUserNameTemp.length > 32) {
-                            myUserNameTemp = myUserNameTemp.substr(0, 32);
-                        }
-                        myUserName = myUserNameTemp;
-                        myData[myID] = {
-                            name: myUserName
-                        };
-                        addToUserList(myData);
-                        editor.fire('change');
+                    Cryptpad.prompt(Messages.changeNamePrompt, lastName, function (newName) {
+                        setName(newName);
                     });
                 });
             };
@@ -524,6 +535,10 @@ define([
                 console.log("Unlocking editor");
                 setEditable(true);
                 initializing = false;
+                var lastName = getLastName();
+                if (typeof(lastName) === 'string' && lastName.length) {
+                    setName(lastName);
+                }
             };
 
             var onAbort = realtimeOptions.onAbort = function (info) {