diff --git a/controllers/QuestsController.inc b/controllers/QuestsController.inc
index e8ed7fca..ee8a3c67 100644
--- a/controllers/QuestsController.inc
+++ b/controllers/QuestsController.inc
@@ -252,7 +252,13 @@
 				$questtype = $this->Questtypes->getQuesttypeById($quest['questtype_id']);
 				
 				// Render task
-				$task = $this->renderTask($questtype['classname'], $seminary, $questgroup, $quest, $character);
+				if(!is_null($questtype['classname'])) {
+					$task = $this->renderTask($questtype['classname'], $seminary, $questgroup, $quest, $character);
+				}
+				else {
+					// Mark Quest as solved
+					$this->Quests->setQuestSolved($quest['id'], $character['id']);
+				}
 			}
 			
 			// Has Character solved quest?
diff --git a/views/html/quests/quest.tpl b/views/html/quests/quest.tpl
index 26911951..6d7e8c06 100644
--- a/views/html/quests/quest.tpl
+++ b/views/html/quests/quest.tpl
@@ -45,19 +45,21 @@
 </section>
 <?php endif ?>
 
-<?php if(!is_null($task)) : ?>
+<?php if($questtexttype['type'] == 'Prolog') : ?>
 <section>
+	<?php if(!is_null($task)) : ?>
 	<h1 id="task"><?=_('Task')?></h1>
 	<p><?=\hhu\z\Utils::t($quest['task'])?></p>
 	<?=$task?>
+	<?php endif ?>
 	
-	<?php if($solved) : ?>
+	<?php if($solved && !is_null($task)) : ?>
 	<p><?=_('Task already successfully solved')?>:</p>
+	<?php endif ?>
 	<ul>
-		<li><a href="<?=$linker->link(null,0,false,array('show-answer'=>'true'),true,'task')?>"><?=_('Show answer')?></a></li>
+		<?php if(!is_null($task)) : ?><li><a href="<?=$linker->link(null,0,false,array('show-answer'=>'true'),true,'task')?>"><?=_('Show answer')?></a></li><?php endif ?>
 		<li><a href="<?=$linker->link('Epilog',5)?>">Aufgabe Überspringen</a></l>
 	</ul>
-	<?php endif ?>
 </section>
 <?php endif ?>