diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php
index 8f50fcbff..4836f9922 100644
--- a/e107_admin/cpage.php
+++ b/e107_admin/cpage.php
@@ -480,7 +480,7 @@ class page_admin_ui extends e_admin_ui
 			'page_template' 	=> array('title'=> LAN_TEMPLATE, 		'tab' => 0,	'type' => 'dropdown', 	'width' => 'auto','filter' => true, 'batch'=>true, 'inline'=>true, 'writeParms'=>''),
 
 		 	'page_author' 		=> array('title'=> LAN_AUTHOR, 		'tab' => 0,	'type' => 'user', 'inline'=>true, 		'data'=>'int','width' => 'auto', 'thclass' => 'left'),
-			'page_text' 		=> array('title'=> CUSLAN_9,		'tab' => 0,	'type' => 'bbarea',		'data'=>'str',	'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1', 'writeParms'=>'media=page&template=page'), 
+			'page_text' 		=> array('title'=> CUSLAN_9,		'tab' => 0,	'type' => 'bbarea',		'data'=>'str',	'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1', 'writeParms'=>array('media'=>'page', 'template'=>'page')),
 		
 		
 			// Options Tab. 
@@ -593,7 +593,18 @@ class page_admin_ui extends e_admin_ui
                 $this->parseAliases();
 			}
 				
-							
+
+			if($this->getAction() == 'create' && e_DEBUG === true)
+			{
+
+				$tmp = e107::getCoreTemplate('page', 'default');
+				if(!empty($tmp['editor']))
+				{
+					$this->fields['page_text']['writeParms']['default'] = $tmp['editor'];
+				}
+
+			}
+
 			
 			$this->templates = e107::getLayouts('', 'page', 'front', '', true, false); 
 			unset($this->templates['panel'], $this->templates['nav']);
diff --git a/e107_core/templates/page_template.php b/e107_core/templates/page_template.php
index 09a00162f..026f3a0fd 100644
--- a/e107_core/templates/page_template.php
+++ b/e107_core/templates/page_template.php
@@ -100,7 +100,7 @@ $sc_style['CPAGENAV|default']['post'] = '</div>';
 	$PAGE_TEMPLATE['default']['related']['item']    = '<div class="col-md-4"><a href="{RELATED_URL}">{RELATED_IMAGE}</a><h3><a href="{RELATED_URL}">{RELATED_TITLE}</a></h3></div>';
 	$PAGE_TEMPLATE['default']['related']['end']     = '</div>';
 
-
+	// $PAGE_TEMPLATE['default']['editor'] = '<ul class="fa-ul"><li><i class="fa fa-li fa-edit"></i> Level 1</li><li><i class="fa fa-li fa-cog"></i> Level 2</li></ul>';
 
 	
 #### No table render example template ####