diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f80e1fa..befeb682 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # v1.9.0-beta.6
 ## mm/dd/2018
 
-1. [](#bugfix)
-    * Fix Grav core update causing error when underlying classes change
+1. [](#improved)
+    * v.1.8.14 fixes merged in    
 
 # v1.9.0-beta.5
 ## 11/05/2018
@@ -52,6 +52,7 @@
 
 1. [](#bugfix)
     * Fixed Grav core update potentially spinning forever because of an error which happens after a successful upgrade
+    * Saving in expert mode can cause `undefined index: header` error [#1537](https://github.com/getgrav/grav-plugin-admin/issues/1537)
 
 # v1.8.13
 ## 11/05/2018
diff --git a/classes/admincontroller.php b/classes/admincontroller.php
index 248455a3..69b161de 100644
--- a/classes/admincontroller.php
+++ b/classes/admincontroller.php
@@ -658,7 +658,7 @@ class AdminController extends AdminBaseController
             // XSS Checks for page content
             $xss_whitelist = $this->grav['config']->get('security.xss_whitelist', 'admin.super');
             if (!$this->admin->authorize($xss_whitelist)) {
-                $check_what = ['header' => $data['header'], 'content' => isset($data['content']) ? $data['content'] : ''];
+                $check_what = ['header' => isset($data['header']) ? $data['header'] : '', 'frontmatter' => isset($data['frontmatter']) ? $data['frontmatter'] : '', 'content' => isset($data['content']) ? $data['content'] : ''];
                 $results = Security::detectXssFromArray($check_what);
                 if (!empty($results)) {
                     $this->admin->setMessage('<i class="fa fa-ban"></i> ' . $this->admin->translate('PLUGIN_ADMIN.XSS_ONSAVE_ISSUE'),