diff --git a/lang/main.json b/lang/main.json
index 38465864f..bb406ffea 100644
--- a/lang/main.json
+++ b/lang/main.json
@@ -197,8 +197,8 @@
         "lockMessage": "Failed to lock the conference.",
         "warning": "Warning",
         "passwordNotSupported": "Room passwords are currently not supported.",
-        "sorry": "Sorry",
-        "internalError": "Internal application error [setRemoteDescription]",
+        "internalErrorTitle": "Internal error",
+        "internalError": "Oups! Something went wrong. The following error occurred: [setRemoteDescription]",
         "unableToSwitch": "Unable to switch video stream.",
         "SLDFailure": "Oops! Something went wrong and we failed to mute! (SLD Failure)",
         "SRDFailure": "Oops! Something went wrong and we failed to stop video! (SRD Failure)",
@@ -246,7 +246,8 @@
         "password": "Enter password",
         "userPassword": "user password",
         "token": "token",
-        "tokenAuthFailed": "Failed to authenticate with XMPP server: invalid token",
+        "tokenAuthFailedTitle": "Authentication problem",
+        "tokenAuthFailed": "Sorry, you're not allowed to join this call.",
         "displayNameRequired": "Please enter your display name",
         "extensionRequired": "Extension required:",
         "firefoxExtensionPrompt": "You need to install a Firefox extension in order to use screen sharing. Please try again after you <a href='__url__'>get it from here</a>!",
diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index d09e98323..90156f866 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -1152,11 +1152,13 @@ UI.updateRecordingState = function (state) {
 };
 
 UI.notifyTokenAuthFailed = function () {
-    messageHandler.showError("dialog.error", "dialog.tokenAuthFailed");
+    messageHandler.showError(   "dialog.tokenAuthFailedTitle",
+                                "dialog.tokenAuthFailed");
 };
 
 UI.notifyInternalError = function () {
-    messageHandler.showError("dialog.sorry", "dialog.internalError");
+    messageHandler.showError(   "dialog.internalErrorTitle",
+                                "dialog.internalError");
 };
 
 UI.notifyFocusDisconnected = function (focus, retrySec) {