diff --git a/config/vanilla/config.php b/config/vanilla/config.php
index 02ade6d..32a110e 100644
--- a/config/vanilla/config.php
+++ b/config/vanilla/config.php
@@ -1,6 +1,9 @@
 <?php if (!defined('APPLICATION')) exit();
 
 $Configuration['Garden']['Installed'] = true;
+//Embed
+$Configuration['Garden']['Embed']['Allow'] = true;
+$Configuration['Garden']['Embed']['ForceForum'] = true;
 
 $Configuration['Database']['Name'] = getenv('MYSQL_DATABASE');
 $Configuration['Database']['Host'] = getenv('MYSQL_HOST');
diff --git a/vanilla/applications/dashboard/settings/class.hooks.php b/vanilla/applications/dashboard/settings/class.hooks.php
index badde9e..32896d7 100644
--- a/vanilla/applications/dashboard/settings/class.hooks.php
+++ b/vanilla/applications/dashboard/settings/class.hooks.php
@@ -254,7 +254,8 @@ public function base_render_before($sender) {
                 $sender->addJsFile('embed_local.js');
             }
         } else {
-            $sender->setHeader('X-Frame-Options', 'SAMEORIGIN');
+            // FIX: MFE-9 issue: add this header sporadically
+            // $sender->setHeader('X-Frame-Options', 'SAMEORIGIN');
         }