diff --git a/l10n/da/viewer.properties b/l10n/da/viewer.properties
index 376affe4b..0c566b96e 100644
--- a/l10n/da/viewer.properties
+++ b/l10n/da/viewer.properties
@@ -116,6 +116,7 @@ missing_file_error=Manglende PDF-fil
 # Nogle almindelige typer er f.eks.: "Check", "Text", "Comment" og "Note"
 text_annotation_type=[{{type}} Kommentar]
 request_password=PDF filen er beskyttet med et kodeord:
+invalid_password=Ugyldigt kodeord.
 
 printing_not_supported=Advarsel: Denne browser er ikke fuldt understøttet ved udskrift.
 printing_not_ready=Advarsel: PDF-filen er ikke helt klar til udskrivning.
diff --git a/l10n/en-US/viewer.properties b/l10n/en-US/viewer.properties
index 3c174e4e8..987c90431 100644
--- a/l10n/en-US/viewer.properties
+++ b/l10n/en-US/viewer.properties
@@ -116,6 +116,7 @@ missing_file_error=Missing PDF file.
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
 text_annotation_type=[{{type}} Annotation]
 request_password=PDF is protected by a password:
+invalid_password=Invalid Password.
 
 printing_not_supported=Warning: Printing is not fully supported by this browser.
 printing_not_ready=Warning: The PDF is not fully loaded for printing.
diff --git a/l10n/pl/viewer.properties b/l10n/pl/viewer.properties
index 159d4e040..9aa576f3a 100644
--- a/l10n/pl/viewer.properties
+++ b/l10n/pl/viewer.properties
@@ -120,4 +120,4 @@ request_password=Plik PDF jest chroniony przez hasło:
 printing_not_supported=Ostrzeżenie: Drukowanie nie jest w pełni obsługiwane przez tę przeglądarkę.
 printing_not_ready=Ostrzeżenie: Plik PDF nie jest całkowicie wczytany do drukowania.
 web_fonts_disabled=Web fonty są nieaktywne. Nie można korzystać z osadzonych czcionek w plikach PDF.
-web_colors_disabled=Kolory WWW są nieaktywne.
+document_colors_disabled=Dokumenty PDF nie mają pozwolenia na korzystanie z ich własnych kolorów: \'Pozwalaj stronom stosować inne kolory niż ustawione tutaj\' nie jest aktywne w przeglądarce.
diff --git a/l10n/zh-TW/viewer.properties b/l10n/zh-TW/viewer.properties
index 95a886ea7..1ff8ad603 100644
--- a/l10n/zh-TW/viewer.properties
+++ b/l10n/zh-TW/viewer.properties
@@ -110,4 +110,4 @@ request_password=PDF檔案受密碼保護：
 printing_not_supported=警告：這個瀏覽器不完全支援列印。
 printing_not_ready=警告：PDF檔案未完全加載以進行打印。
 web_fonts_disabled=禁止使用網路字型：無法使用嵌入PDF檔案的字型。
-web_colors_disabled=網絡顏色已被停用。
+document_colors_disabled=PDF文件不容許使用自己的顏色：瀏覽器的 “容許頁面選擇自己的顏色“ 選項已被停用。
diff --git a/web/viewer.js b/web/viewer.js
index d2d7f66db..56023cf32 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -1057,9 +1057,16 @@ var PDFView = {
       },
       function getDocumentError(message, exception) {
         if (exception && exception.name === 'PasswordException') {
-          if (exception.code === 'needpassword') {
+          if (exception.code === 'needpassword' ||
+              exception.code === 'incorrectpassword') {
             var promptString = mozL10n.get('request_password', null,
                                       'PDF is protected by a password:');
+
+            if (exception.code === 'incorrectpassword') {
+              promptString += '\n' + mozL10n.get('invalid_password', null,
+                                      'Invalid Password.');
+            }
+
             password = prompt(promptString);
             if (password && password.length > 0) {
               return PDFView.open(url, scale, password);
@@ -2261,10 +2268,16 @@ var PageView = function pageView(container, id, scale,
           return;
       }
 
-      if (scale && scale !== PDFView.currentScale)
+      if (scale && scale !== PDFView.currentScale) {
         PDFView.parseScale(scale, true, true);
-      else if (PDFView.currentScale === UNKNOWN_SCALE)
+      } else if (PDFView.currentScale === UNKNOWN_SCALE) {
         PDFView.parseScale(DEFAULT_SCALE, true, true);
+      }
+
+      if (scale === 'page-fit' && !dest[4]) {
+        scrollIntoView(div);
+        return;
+      }
 
       var boundingRect = [
         this.viewport.convertToViewportPoint(x, y),