diff --git a/dashboard/survey_erfassen.php b/dashboard/survey_erfassen.php
index c19b0a0..ddb54ff 100644
--- a/dashboard/survey_erfassen.php
+++ b/dashboard/survey_erfassen.php
@@ -40,6 +40,7 @@ if ($action == '') {
         unset($_SESSION["umfrageerf_value_zeitbis"]);
         unset($_SESSION["umfrageerf_value_headline"]);
         unset($_SESSION["umfrageerf_value_freitext"]);
+        unset($_SESSION["umfrageerf_value_freitext_headline"]);
         $smarty->assign('umfrageerf_value_freitext', 0);
         unset($_SESSION["umfrageerf_umid"]);
         unset($_SESSION["umfrageerf_ufid"]);
@@ -56,6 +57,7 @@ if ($action == '') {
                                           , date_format(datum_bis, '%H:%i') zeit_bis
                                           , headline
                                           , freitext
+                                          , freitext_headline
                                        FROM jumi_umfragen
                                       WHERE umid = $umid");
           $row_edit    = $result_edit->fetch_array();
@@ -65,6 +67,9 @@ if ($action == '') {
           $_SESSION["umfrageerf_value_zeitbis"] = $row_edit['zeit_bis'];
           $_SESSION["umfrageerf_value_headline"] = $row_edit['headline'];
           $_SESSION["umfrageerf_value_freitext"] = $row_edit['freitext'];
+          $_SESSION["umfrageerf_value_freitext_headline"] = $row_edit['freitext_headline'];
+          
+          
           # Erste Frage selektieren, damit der Reiter für die Frage gleich aktiv ist
           $result_q1 = $db->query("SELECT min(ufid) ufid
                                        FROM jumi_umfragen_fragen
@@ -78,6 +83,7 @@ if ($action == '') {
         $smarty->assign('umfrageerf_value_zeitbis', $_SESSION["umfrageerf_value_zeitbis"]);
         $smarty->assign('umfrageerf_value_headline', $_SESSION["umfrageerf_value_headline"]);
         $smarty->assign('umfrageerf_value_freitext', $_SESSION["umfrageerf_value_freitext"]);
+        $smarty->assign('umfrageerf_value_freitext_headline', $_SESSION["umfrageerf_value_freitext_headline"]);
 #        $smarty->assign('umfrageerf_value_new', "0");
 #        $_SESSION["umfrageerf_new"] = 0;
       }        
@@ -213,6 +219,17 @@ if ($action == 'fragen') {
         $freitext = $_SESSION["umfrageerf_value_freitext"];
     }
     
+    if($freitext == '1'){
+      $freitext_headline = $_POST['freitext_headline'];
+      if (isset($_POST['freitext_headline']) and trim($_POST['freitext_headline']) != '') {
+          $_SESSION["umfrageerf_value_freitext_headline"] = $freitext_headline;
+      }else{
+          $_SESSION["umfrageerf_value_freitext_headline"] = "";
+      }
+    }else{
+        $freitext_headline = "";
+    }
+    
     
         $datumvon_form = preg_replace('/^(\\d{2})\\.(\\d{2})\\.(\\d{4})$/', '$3-$2-$1', $datumvon);
         $datumbis_form = preg_replace('/^(\\d{2})\\.(\\d{2})\\.(\\d{4})$/', '$3-$2-$1', $datumbis);
@@ -246,6 +263,7 @@ if ($action == 'fragen') {
                                                   , uid
                                                   , datum_erfasst
                                                   , freitext
+                                                  , freitext_headline
                                                   )
                                   VALUES
                                                   ( '$datum_von'
@@ -254,6 +272,7 @@ if ($action == 'fragen') {
                                                   , '$uid'
                                                   , '$datum'
                                                   , '$freitext'
+                                                  , '$freitext_headline'
                                                   )
                                 ");
           $umid                        = $db->insert_id;
@@ -264,6 +283,7 @@ if ($action == 'fragen') {
                                     ,datum_bis ='$datum_bis'
                                     ,headline = '$headline'
                                     ,freitext = '$freitext'
+                                    ,freitext_headline = '$freitext_headline'
                                WHERE umid = $umid
                             ");
 
diff --git a/survey/index.php b/survey/index.php
index 0c9eba3..45e9cde 100644
--- a/survey/index.php
+++ b/survey/index.php
@@ -116,7 +116,7 @@ if ($action == 'umfrage') {
                 }
             }
         }
-        if (isset($_POST['freitext']) AND $_POST['freitext'] == '') {
+        if (isset($_POST['freitext']) AND $_POST['freitext'] != '') {
             $freitext = $_POST['freitext'];
             $del1     = $db->query("DELETE FROM jumi_umfragen_erg_freitext WHERE ip='$ip' AND session='$session'");
             $sql1     = $db->query("INSERT INTO jumi_umfragen_erg_freitext (umid, ip, session, freitext)
@@ -227,6 +227,17 @@ if ($action == 'umfrage') {
                                     AND session = '$session'");
         $row_antw    = $result_antw->fetch_array();
         $smarty->assign('umfrage_value_freitext', "$row_antw[freitext]");
+
+        $result_head = $db->query("SELECT freitext_headline
+                                   FROM jumi_umfragen
+                                  WHERE umid = $umid");
+        $row_head    = $result_head->fetch_array();
+        
+        if($row_head['freitext_headline'] != ''){
+          $smarty->assign('umfrage_value_freitext_headline', "$row_head[freitext_headline]");
+        }else{
+          $smarty->assign('umfrage_value_freitext_headline', "Raum für Hinweise/Bemerkungen");
+        }
         
     } else {
         $smarty->assign('umfrage_showfreitext', "0");
diff --git a/templates/modern/dashboard/survey_erfassen.html b/templates/modern/dashboard/survey_erfassen.html
index 7ba5eb4..50c6b1a 100644
--- a/templates/modern/dashboard/survey_erfassen.html
+++ b/templates/modern/dashboard/survey_erfassen.html
@@ -160,13 +160,17 @@
                            <div class="col-12 col-md-8"><input class="form-control" type="text" name="headline" id="headline" value="{$umfrageerf_value_headline}" size="60"></div>
                         </div>
                         <div class="row mt-0 mt-sm-4 mb-0 mb-sm-4">
-                           <div class="col-12 col-md-4">Bemerkungsfeld am Ende der Umfrage:</div>
+                           <div class="col-12 col-md-4">Freitextfeld am Ende der Umfrage:</div>
                            <div class="col-12 col-md-8">
                               <div class="form-check form-switch">
                                  <input class="form-check-input" type="checkbox" name="freitext" id="freitext" value="{$umfrageerf_value_freitext}" {if $umfrageerf_value_freitext == 1} checked {/if}>
                               </div>
                            </div>
                         </div>
+                        <div class="row mt-0 mt-sm-4 mb-0 mb-sm-4">
+                           <div class="col-12 col-md-4">Überschrift der Freitextfrage:</div>
+                           <div class="col-12 col-md-8"><input class="form-control" type="text" name="freitext_headline" id="freitext_headline" value="{$umfrageerf_value_freitext_headline}" size="60"></div>
+                        </div>
                      </div>
                   </div>
                   <div class="col-12 btn-group">
diff --git a/templates/modern/survey/index.html b/templates/modern/survey/index.html
index ba4243f..8d72b23 100644
--- a/templates/modern/survey/index.html
+++ b/templates/modern/survey/index.html
@@ -269,7 +269,7 @@
                {if $umfrage_showfreitext == '1'}
                <div class="question col-12 ">
                   <h4>
-                     <p class="text-center">Raum für Hinweise/Bemerkungen</p>
+                     <p class="text-center">{$umfrage_value_freitext_headline}</p>
                   </h4>
                </div>
                <br>