diff --git a/app.js b/app.js
index fa1e0c10d..0cb30f9dd 100644
--- a/app.js
+++ b/app.js
@@ -1036,7 +1036,7 @@ $(document).ready(function () {
         {
             var val = $("#enter_room_field").val();
             if(!val)
-                val = $("#enter_room_field").attr("placeholder");
+                val = $("#enter_room_field").attr("room_name");
             window.location.pathname = "/" + val;
         });
 
@@ -1057,9 +1057,10 @@ $(document).ready(function () {
 
         function update_roomname()
         {
-
+            var word = RoomNameGenerator.generateRoomWithoutSeparator();
+            $("#enter_room_field").attr("room_name", word);
             $("#enter_room_field").attr("placeholder", "");
-            animate(RoomNameGenerator.generateRoomWithoutSeparator());
+            animate(word);
             setTimeout(update_roomname, 10000);
 
         }
diff --git a/index.html b/index.html
index 3a5f2ff5e..ddee6a8a4 100644
--- a/index.html
+++ b/index.html
@@ -106,7 +106,7 @@
                     <div class="feature_holder">
                         <div class="feature_icon">Open source</div>
                         <div class="feature_description">
-                            <span name="appName"></span> is licensed under the &lt;GPL/LGPL/WHATEVER&gt;. You can download, use, modify, and share the software without any restrictions.
+                            <span name="appName"></span> is licensed under MIT. You are free to download, use, modify, and share them as per these licenses.
                         </div>
                     </div>
                     <div class="feature_holder">