diff --git a/index.html b/index.html
index 98bfba5fd..c009a3758 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
     <script src="interface_config.js?v=5"></script>
-    <script src="libs/app.bundle.js?v=25"></script>
+    <script src="libs/app.bundle.js?v=26"></script>
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
     <link rel="stylesheet" href="css/font.css?v=6"/>
     <link rel="stylesheet" href="css/toastr.css?v=1">
diff --git a/lang/main.json b/lang/main.json
index 5c121da54..e90f2e05a 100644
--- a/lang/main.json
+++ b/lang/main.json
@@ -178,7 +178,10 @@
         "gracefulShutdown": "Our service is currently down for maintenance. Please try again later.",
         "Yes": "Yes",
         "reservationError": "Reservation system error",
-        "reservationErrorMsg": "Error code: __code__, message: __msg__"
+        "reservationErrorMsg": "Error code: __code__, message: __msg__",
+        "password": "password",
+        "userPassword": "user password",
+        "token": "token"
 
     }
 }
diff --git a/libs/app.bundle.js b/libs/app.bundle.js
index 1802f4dbd..94fa960a2 100644
--- a/libs/app.bundle.js
+++ b/libs/app.bundle.js
@@ -1715,7 +1715,10 @@ function onPasswordReqiured(callback) {
     message += APP.translation.translateString(
         "dialog.passwordRequired");
     message += '</h2>' +
-        '<input id="lockKey" type="text" placeholder="password" autofocus>';
+        '<input id="lockKey" type="text" data-i18n=' +
+        '"[placeholder]dialog.password" placeholder="' +
+        APP.translation.translateString("dialog.password") +
+        '" autofocus>';
 
     messageHandler.openTwoButtonDialog(null, null, null, message,
         true,
@@ -1881,7 +1884,8 @@ UI.showLoginPopup = function(callback)
         '<input id="passwordrequired.username" type="text" ' +
         'placeholder="user@domain.net" autofocus>' +
         '<input id="passwordrequired.password" ' +
-        'type="password" placeholder="user password">';
+        'type="password" data-i18n="[placeholder]dialog.userPassword"' +
+        ' placeholder="user password">';
     UI.messageHandler.openTwoButtonDialog(null, null, null, message,
         true,
         "dialog.Ok",
@@ -4747,10 +4751,12 @@ function toggleRecording() {
     APP.xmpp.toggleRecording(function (callback) {
         var msg = APP.translation.generateTranslatonHTML(
             "dialog.recordingToken");
+        var token = APP.translation.translateString("dialog.token");
         APP.UI.messageHandler.openTwoButtonDialog(null, null, null,
                 '<h2>' + msg + '</h2>' +
                 '<input id="recordingToken" type="text" ' +
-                'placeholder="token" autofocus>',
+                ' data-i18n="[placeholder]dialog.token" ' +
+                'placeholder="' + token + '" autofocus>',
             false,
             "dialog.Save",
             function (e, v, m, f) {
@@ -5000,6 +5006,7 @@ var Toolbar = (function (my) {
                 messageHandler.openTwoButtonDialog(null, null, null,
                     '<h2>' + msg + '</h2>' +
                         '<input id="lockKey" type="text"' +
+                        ' data-i18n="[placeholder]dialog.yourPassword" ' +
                         'placeholder="' + yourPassword + '" autofocus>',
                     false,
                     "dialog.Save",
diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index ebf5d2ae5..cdf06de62 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -478,7 +478,10 @@ function onPasswordReqiured(callback) {
     message += APP.translation.translateString(
         "dialog.passwordRequired");
     message += '</h2>' +
-        '<input id="lockKey" type="text" placeholder="password" autofocus>';
+        '<input id="lockKey" type="text" data-i18n=' +
+        '"[placeholder]dialog.password" placeholder="' +
+        APP.translation.translateString("dialog.password") +
+        '" autofocus>';
 
     messageHandler.openTwoButtonDialog(null, null, null, message,
         true,
@@ -644,7 +647,8 @@ UI.showLoginPopup = function(callback)
         '<input id="passwordrequired.username" type="text" ' +
         'placeholder="user@domain.net" autofocus>' +
         '<input id="passwordrequired.password" ' +
-        'type="password" placeholder="user password">';
+        'type="password" data-i18n="[placeholder]dialog.userPassword"' +
+        ' placeholder="user password">';
     UI.messageHandler.openTwoButtonDialog(null, null, null, message,
         true,
         "dialog.Ok",
diff --git a/modules/UI/toolbars/Toolbar.js b/modules/UI/toolbars/Toolbar.js
index 3a30f8961..d902d8f09 100644
--- a/modules/UI/toolbars/Toolbar.js
+++ b/modules/UI/toolbars/Toolbar.js
@@ -128,10 +128,12 @@ function toggleRecording() {
     APP.xmpp.toggleRecording(function (callback) {
         var msg = APP.translation.generateTranslatonHTML(
             "dialog.recordingToken");
+        var token = APP.translation.translateString("dialog.token");
         APP.UI.messageHandler.openTwoButtonDialog(null, null, null,
                 '<h2>' + msg + '</h2>' +
                 '<input id="recordingToken" type="text" ' +
-                'placeholder="token" autofocus>',
+                ' data-i18n="[placeholder]dialog.token" ' +
+                'placeholder="' + token + '" autofocus>',
             false,
             "dialog.Save",
             function (e, v, m, f) {
@@ -381,6 +383,7 @@ var Toolbar = (function (my) {
                 messageHandler.openTwoButtonDialog(null, null, null,
                     '<h2>' + msg + '</h2>' +
                         '<input id="lockKey" type="text"' +
+                        ' data-i18n="[placeholder]dialog.yourPassword" ' +
                         'placeholder="' + yourPassword + '" autofocus>',
                     false,
                     "dialog.Save",