diff --git a/syntax.php b/syntax.php
index 4a64e47..5776204 100644
--- a/syntax.php
+++ b/syntax.php
@@ -204,11 +204,12 @@ public function render($format, Doku_Renderer $R, $data) {
         if(isset($_POST['bureaucracy']) && checkSecurityToken() && $_POST['bureaucracy']['$$id'] == $this->form_id) {
             $success = $this->_handlepost($data);
             if($success !== false) {
-                $R->doc .= '<div class="bureaucracy__plugin" id="scroll__here">' . $success . '</div>';
+                //$R->doc .= '<div class="bureaucracy__plugin" id="scroll__here">' . $success . '</div>';
+                $split = strpos($success, "<div");
+                $R->doc = '<div class="bureaucracy__plugin" id="scroll__here">'.$R->render_text(substr($success,0,$split)).'</div>'.substr($success,$split);
                 return true;
             }
         }
-
         $R->doc .= $this->_htmlform($data['fields']);
 
         return true;
@@ -316,7 +317,7 @@ private function _handlepost($data) {
         }
 
         $thanks_array = array();
-		
+
         foreach($data['actions'] as $actionData) {
             /** @var helper_plugin_bureaucracy_action $action */
             $action = $this->loadHelper($actionData['actionname'], false);
@@ -343,13 +344,13 @@ private function _handlepost($data) {
         foreach($data['fields'] as $field) {
             $field->after_action();
         }
-	
+
 		// create thanks string
 		$thanks = '';
 		foreach(array_unique($thanks_array) as $thanks_string) {
-			$thanks .= '<p>' . $thanks_string . '</p>';
+			$thanks .= html_entity_decode($thanks_string);
 		}
-	
+
         return $thanks;
     }