diff --git a/controllers/lamp.php b/controllers/lamp.php
index 2afba19189b358e8caf66eadb2a7886afdbc5d0a..5b9c2d4b66ef3b24b738f4fcd1e7fd75fa267ec1 100644
--- a/controllers/lamp.php
+++ b/controllers/lamp.php
@@ -45,7 +45,7 @@ class LampController extends PluginController {
             throw new AccessDeniedException();
         }
 
-        if (Request::isPost() && Request::submitted('create')) {
+        if (Request::submitted('create')) {
             CSRFProtection::verifySecurityToken();
 
             $data['user_id'] = User::findCurrent()->id;
@@ -92,14 +92,12 @@ class LampController extends PluginController {
         $this->brainstorm = new Brainstorm($id);
 
         // Insert new subbrainstorm
-        if (Request::isPost() && Request::submitted('create')) {
-            CSRFProtection::verifySecurityToken();
+        if (Request::submitted('create')) {
             $this->brainstorm->answer(Request::get('answer'));
         }
 
         // Check if vote is required
-        if (Request::isPost() && Request::submitted('vote')) {
-            CSRFProtection::verifySecurityToken();
+        if (Request::submitted('vote')) {
             $brainstorm = new Brainstorm(Request::get('brainstorm_id'));
             $brainstorm->vote(key(Request::getArray('vote')));
         }
diff --git a/views/lamp/_linked_brainstorm.php b/views/lamp/_linked_brainstorm.php
index 13323675a7e99e6b69593f21f81c0254a42a8093..4248a2e190b7614efaea21e169198dfd1bf87ddc 100644
--- a/views/lamp/_linked_brainstorm.php
+++ b/views/lamp/_linked_brainstorm.php
@@ -3,7 +3,7 @@
     <header>
         <h1>
             <a href="<?= $controller->url_for('lamp/brainstorm/' . $brainstorm->id) ?>">
-            <?= htmlReady($brainstorm->title) ?>
+            <?= $brainstorm->title ?>
             </a>
         </h1>
         <nav>
diff --git a/views/lamp/_voteable_brainstorm.php b/views/lamp/_voteable_brainstorm.php
index 4bed99bf56c6b15c7f283b375d0bb598eb1d29f4..d06462a2d38ee2381be37ae9a81a6459d778230e 100644
--- a/views/lamp/_voteable_brainstorm.php
+++ b/views/lamp/_voteable_brainstorm.php
@@ -10,7 +10,7 @@
             </form>
         </nav>
         <? if ($brainstorm->title) : ?>
-            <h1><?= htmlReady($brainstorm->title) ?></h1>
+            <h1><?= $brainstorm->title ?></h1>
         <? endif ?>
         <div class='power'>
             <?= $brainstorm->power ?>
diff --git a/views/lamp/brainstorm.php b/views/lamp/brainstorm.php
index ff4a52f0789e613191b414797825075a0dc42434..09145975c18cd4dd25a3a21f693118d24bc2e4d5 100644
--- a/views/lamp/brainstorm.php
+++ b/views/lamp/brainstorm.php
@@ -1,6 +1,6 @@
 <? if ($brainstorm->parent) : ?>
     <a href="<?= PluginEngine::getLink($plugin, array(), "lamp/brainstorm/".$brainstorm->parent->getId()) ?>" class="parent_brainstorm">
-        <div class="title"><?= htmlReady($brainstorm->parent->title) ?></div>
+        <div class="title"><?= $brainstorm->parent->title ?></div>
         <div class="body">
             <?= formatReady($brainstorm->parent->text) ?>
         </div>
@@ -17,7 +17,7 @@
             <?= date("G:i d.m.Y", $brainstorm['mkdate']) ?>
         </div>
         <? if ($brainstorm->title) : ?>
-            <h1><?= htmlReady($brainstorm->title) ?></h1>
+            <h1><?= $brainstorm->title ?></h1>
         <? endif ?>
         <div class="body">
             <?= formatReady($brainstorm->text) ?>
diff --git a/views/lamp/edit.php b/views/lamp/edit.php
index 9fff647ebb534634c492a429319642a944206eec..87dd8d19a75c55eacd45af5bad636630bcaf3224 100644
--- a/views/lamp/edit.php
+++ b/views/lamp/edit.php
@@ -16,7 +16,7 @@
                 <input type="text"
                        name="brainstorm[title]"
                        required
-                       value="<?= htmlReady($brainstorm['title']) ?>"
+                       value="<?= $brainstorm['title'] ?>"
                        placeholder="<?= dgettext("aladdin","Frage oder Thema") ?>">
             </label>
         <? endif ?>
@@ -25,7 +25,7 @@
             <?= dgettext("aladdin",'Text') ?>
             <textarea name="brainstorm[text]"
                       required
-                      placeholder="<?= dgettext("aladdin","Um was soll's gehen?") ?>"><?= htmlReady($brainstorm['text']) ?></textarea>
+                      placeholder="<?= dgettext("aladdin","Um was soll's gehen?") ?>"><?= $brainstorm['text'] ?></textarea>
         </label>
     </fieldset>