diff --git a/_config.php b/_config.php
index b3d9bbc..62a2de0 100644
--- a/_config.php
+++ b/_config.php
@@ -1 +1,3 @@
 <?php
+
+?>
diff --git a/code/BlogHolder.php b/code/BlogHolder.php
index a3fe938..98f11b4 100644
--- a/code/BlogHolder.php
+++ b/code/BlogHolder.php
@@ -295,15 +295,21 @@ class BlogHolder_Controller extends Page_Controller {
 		$codeparser = new BBCodeParser();
 		$membername = Member::currentMember() ? Member::currentMember()->getName() : "";
 		
+		if(BlogEntry::$allow_wysiwyg_editing) {
+			$contentfield = new HtmlEditorField("BlogPost", _t("BlogEntry.CN"));
+		} else {
+			$contentfield = new CompositeField( 
+				new LiteralField("BBCodeHelper","<a id=\"BBCodeHint\" target='new'>"._t("BlogEntry.BBH")."</a><div class='clear'><!-- --></div>" ),
+				new TextareaField("BlogPost", _t("BlogEntry.CN"),20), // This is called BlogPost as the id #Content is generally used already
+				new LiteralField("BBCodeTags","<div id=\"BBTagsHolder\">".$codeparser->useable_tagsHTML()."</div>")
+			);
+		}
+		
 		$fields = new FieldSet(
 			new HiddenField("ID", "ID"),
 			new TextField("Title",_t('BlogHolder.SJ', "Subject")),
 			new TextField("Author",_t('BlogEntry.AU'),$membername),
-			new CompositeField( 
-				new LiteralField("BBCodeHelper","<a id=\"BBCodeHint\" target='new'>"._t("BlogEntry.BBH")."</a><div class='clear'><!-- --></div>" ),
-				new TextareaField("BlogPost", _t("BlogEntry.CN"),20), // This is called BlogPost as the id #Content is generally used already
-				new LiteralField("BBCodeTags","<div id=\"BBTagsHolder\">".$codeparser->useable_tagsHTML()."</div>")
-			),
+			$contentfield,
 			new TextField("Tags","Tags"),
 			new LiteralField("Tagsnote"," <label id='tagsnote'>"._t('BlogHolder.TE', "For example: sport, personal, science fiction")."<br/>" .
 												_t('BlogHolder.SPUC', "Please separate tags using commas.")."</label>")