diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b3d47a8..0642da7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,8 @@
 ## mm/dd/2020
 
 1. [](#bugfix)
-    * Fixed issue that would force a page reload when failing to install/update a plugin or theme.
+    * Fixed issue that would force a page reload when failing to install/update a plugin or theme
+    * Fixed proxy/browser caching issues in admin pages
 
 # v1.9.16
 ## 09/01/2020
diff --git a/admin.php b/admin.php
index 0ecc2d04..b8e43f64 100644
--- a/admin.php
+++ b/admin.php
@@ -451,6 +451,8 @@ class AdminPlugin extends Plugin
         // Replace page service with admin.
         $this->grav['page'] = function () use ($self) {
             $page = new Page();
+
+            // Plugins may not have the correct Cache-Control header set, force no-store for the proxies.
             $page->expires(0);
 
             if ($this->grav['user']->authorize('admin.login')) {
@@ -467,6 +469,7 @@ class AdminPlugin extends Plugin
             if (file_exists(__DIR__ . "/pages/admin/{$self->template}.md")) {
                 $page->init(new \SplFileInfo(__DIR__ . "/pages/admin/{$self->template}.md"));
                 $page->slug(basename($self->template));
+
                 return $page;
             }
 
diff --git a/pages/admin/ajax.md b/pages/admin/ajax.md
index 0692fd8c..4cf2493b 100644
--- a/pages/admin/ajax.md
+++ b/pages/admin/ajax.md
@@ -1,6 +1,7 @@
 ---
 title: Generic Ajax
 template: default
+expires: 0
 
 access:
     admin.login: true
diff --git a/pages/admin/backup.md b/pages/admin/backup.md
index 0e092d7a..edc07d44 100644
--- a/pages/admin/backup.md
+++ b/pages/admin/backup.md
@@ -1,6 +1,7 @@
 ---
 title: Backup
 template: default
+expires: 0
 
 access:
     admin.maintenance: true
diff --git a/pages/admin/cache.md b/pages/admin/cache.md
index af7f42bd..77a3c058 100644
--- a/pages/admin/cache.md
+++ b/pages/admin/cache.md
@@ -1,6 +1,7 @@
 ---
 title: Cache
 template: default
+expires: 0
 
 access:
     admin.cache: true
diff --git a/pages/admin/config.md b/pages/admin/config.md
index aa5fef18..ad809c50 100644
--- a/pages/admin/config.md
+++ b/pages/admin/config.md
@@ -1,5 +1,6 @@
 ---
 title: Config
+expires: 0
 
 access:
     admin.configuration: true
diff --git a/pages/admin/dashboard.md b/pages/admin/dashboard.md
index 83962023..a41ff970 100644
--- a/pages/admin/dashboard.md
+++ b/pages/admin/dashboard.md
@@ -1,5 +1,6 @@
 ---
 title: Dashboard
+expires: 0
 
 access:
     admin.login: true
diff --git a/pages/admin/denied.md b/pages/admin/denied.md
index 1dc329d0..a5713e98 100644
--- a/pages/admin/denied.md
+++ b/pages/admin/denied.md
@@ -1,4 +1,5 @@
 ---
 title: Access Denied
+expires: 0
 ---
 
diff --git a/pages/admin/error.md b/pages/admin/error.md
index 9cdb85e1..bc6407cc 100644
--- a/pages/admin/error.md
+++ b/pages/admin/error.md
@@ -4,6 +4,7 @@ robots: noindex,nofollow
 template: error
 routable: false
 http_response_code: 404
+expires: 0
 ---
 
 Woops! Looks like this page doesn't exist.
diff --git a/pages/admin/feed.md b/pages/admin/feed.md
index 828d8675..b90cad13 100644
--- a/pages/admin/feed.md
+++ b/pages/admin/feed.md
@@ -1,6 +1,7 @@
 ---
 title: News Feed
 template: ajax
+expires: 0
 
 access:
     admin.login: true
diff --git a/pages/admin/forgot.md b/pages/admin/forgot.md
index 993a35fd..59e6fa63 100644
--- a/pages/admin/forgot.md
+++ b/pages/admin/forgot.md
@@ -1,5 +1,6 @@
 ---
 title: Forgot password
+expires: 0
 
 form:
     fields:
diff --git a/pages/admin/info.md b/pages/admin/info.md
index ca950fda..2733689e 100644
--- a/pages/admin/info.md
+++ b/pages/admin/info.md
@@ -1,6 +1,8 @@
 ---
 title: PHP Info
 template: config
+expires: 0
+
 access:
     admin.settings: true
     admin.super: true
diff --git a/pages/admin/installer.md b/pages/admin/installer.md
index 85a7d08d..f809cdaf 100644
--- a/pages/admin/installer.md
+++ b/pages/admin/installer.md
@@ -1,5 +1,6 @@
 ---
 title: Installer
+expires: 0
 
 access:
     admin.install: true
diff --git a/pages/admin/login.md b/pages/admin/login.md
index f1363eed..f80fd0cc 100644
--- a/pages/admin/login.md
+++ b/pages/admin/login.md
@@ -1,5 +1,6 @@
 ---
 title: Admin Login
+expires: 0
 
 forms:
   login:
@@ -13,7 +14,7 @@ forms:
         autofocus: true
         validate:
           required: true
-    
+
       password:
         type: password
         placeholder: PLUGIN_ADMIN.PASSWORD
@@ -33,5 +34,5 @@ forms:
         type: text
         id: twofa-code
         autofocus: true
-        placeholder: PLUGIN_ADMIN.2FA_CODE_INPUT 
+        placeholder: PLUGIN_ADMIN.2FA_CODE_INPUT
 ---
diff --git a/pages/admin/media.md b/pages/admin/media.md
index e3c11183..f62e554e 100644
--- a/pages/admin/media.md
+++ b/pages/admin/media.md
@@ -1,6 +1,7 @@
 ---
 title: Media
 template: default
+expires: 0
 
 access:
     admin.pages: true
diff --git a/pages/admin/notifications.md b/pages/admin/notifications.md
index df8aff43..2033df61 100644
--- a/pages/admin/notifications.md
+++ b/pages/admin/notifications.md
@@ -1,6 +1,7 @@
 ---
 title: Notifications
 template: default
+expires: 0
 
 access:
     admin.login: true
diff --git a/pages/admin/pages-filter.md b/pages/admin/pages-filter.md
index f196f0df..0aac4465 100644
--- a/pages/admin/pages-filter.md
+++ b/pages/admin/pages-filter.md
@@ -1,6 +1,7 @@
 ---
 title: Pages Filter
 template: default
+expires: 0
 
 access:
     admin.pages: true
diff --git a/pages/admin/pages.md b/pages/admin/pages.md
index b1f7fc40..d73e93f4 100644
--- a/pages/admin/pages.md
+++ b/pages/admin/pages.md
@@ -1,5 +1,6 @@
 ---
 title: Pages
+expires: 0
 
 access:
     admin.pages: true
diff --git a/pages/admin/plugins.md b/pages/admin/plugins.md
index d61155fc..fb24a2fc 100644
--- a/pages/admin/plugins.md
+++ b/pages/admin/plugins.md
@@ -1,5 +1,6 @@
 ---
 title: Plugins
+expires: 0
 
 access:
     admin.plugins: true
diff --git a/pages/admin/preview.md b/pages/admin/preview.md
index 96994993..ea97a295 100644
--- a/pages/admin/preview.md
+++ b/pages/admin/preview.md
@@ -1,5 +1,6 @@
 ---
 title: Preview
+expires: 0
 
 access:
     admin.pages: true
diff --git a/pages/admin/register.md b/pages/admin/register.md
index aec38587..e357427c 100644
--- a/pages/admin/register.md
+++ b/pages/admin/register.md
@@ -1,4 +1,6 @@
 ---
+expires: 0
+
 form:
   fields:
     - name: username
diff --git a/pages/admin/reset.md b/pages/admin/reset.md
index 71108da5..cd4cc58b 100644
--- a/pages/admin/reset.md
+++ b/pages/admin/reset.md
@@ -1,5 +1,6 @@
 ---
 title: Reset password
+expires: 0
 
 form:
     fields:
diff --git a/pages/admin/site.md b/pages/admin/site.md
index 437c2898..46cb1ee1 100644
--- a/pages/admin/site.md
+++ b/pages/admin/site.md
@@ -1,6 +1,8 @@
 ---
 title: Site Settings
 template: config
+expires: 0
+
 access:
     admin.settings: true
     admin.super: true
diff --git a/pages/admin/statistics.md b/pages/admin/statistics.md
index 9a6f9680..e7dea2c7 100644
--- a/pages/admin/statistics.md
+++ b/pages/admin/statistics.md
@@ -1,5 +1,6 @@
 ---
 title: Statistics
+expires: 0
 
 access:
     admin.statistics: true
diff --git a/pages/admin/system.md b/pages/admin/system.md
index 76560180..f2d92461 100644
--- a/pages/admin/system.md
+++ b/pages/admin/system.md
@@ -1,6 +1,8 @@
 ---
 title: Configuration
 template: config
+expires: 0
+
 access:
     admin.configuration: true
     admin.super: true
diff --git a/pages/admin/themes.md b/pages/admin/themes.md
index 57d6217a..2a30d995 100644
--- a/pages/admin/themes.md
+++ b/pages/admin/themes.md
@@ -1,5 +1,6 @@
 ---
 title: Grav Themes
+expires: 0
 
 access:
     admin.themes: true
diff --git a/pages/admin/tools.md b/pages/admin/tools.md
index 1d3c3169..e2b5985e 100644
--- a/pages/admin/tools.md
+++ b/pages/admin/tools.md
@@ -1,5 +1,7 @@
 ---
 title: Grav Tools
+expires: 0
+
 access:
     admin.login: true
 ---
diff --git a/pages/admin/update.md b/pages/admin/update.md
index 1343a62d..f1bed9fb 100644
--- a/pages/admin/update.md
+++ b/pages/admin/update.md
@@ -1,6 +1,7 @@
 ---
 title: Updates
 template: default
+expires: 0
 
 access:
     admin.maintenance: true
diff --git a/pages/admin/user.md b/pages/admin/user.md
index eb7561e9..16e39e6b 100644
--- a/pages/admin/user.md
+++ b/pages/admin/user.md
@@ -1,5 +1,6 @@
 ---
 title: User
+expires: 0
 
 access:
     admin.users: true