diff --git a/index.php b/index.php
index 08c1f934..b9344982 100644
--- a/index.php
+++ b/index.php
@@ -576,7 +576,7 @@ if (!$show['show']) {
                     
 	                <div class="col-sm-12">
                         <textarea placeholder="<?php echo htmlspecialchars($hesklang['message']); ?>" name="message" id="message" class="form-control htmlEditor" rows="12" cols="60" <?php if (in_array('message',$_SESSION['iserror'])) {echo ' class="isError" ';} ?> ><?php if (isset($_SESSION['c_message'])) {echo stripslashes(hesk_input($_SESSION['c_message']));} ?></textarea>
-                        <?php if ($modsForHesk_settings['rich_text_for_tickets']): ?>
+                        <?php if ($modsForHesk_settings['rich_text_for_tickets_for_customers']): ?>
                             <script type="text/javascript">
                                 /* <![CDATA[ */
                                 tinyMCE.init({
diff --git a/reply_ticket.php b/reply_ticket.php
index 997b5017..435a345b 100644
--- a/reply_ticket.php
+++ b/reply_ticket.php
@@ -205,7 +205,7 @@ $ticket['status'] = $ticket['status'] == $defaultNewTicketStatus['ID'] ? $defaul
 $res = hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` SET `lastchange`=NOW(), `status`='{$ticket['status']}', `replies`=`replies`+1, `lastreplier`='0' WHERE `id`='{$ticket['id']}' LIMIT 1");
 
 // Insert reply into database
-$html = $modsForHesk_settings['rich_text_for_tickets'];
+$html = $modsForHesk_settings['rich_text_for_tickets_for_customers'];
 hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` (`replyto`,`name`,`message`,`dt`,`attachments`, `html`) VALUES ({$ticket['id']},'".hesk_dbEscape($ticket['name'])."','".hesk_dbEscape($message)."',NOW(),'".hesk_dbEscape($myattachments)."','".$html."')");
 
 
diff --git a/submit_ticket.php b/submit_ticket.php
index 856df272..5eedc331 100644
--- a/submit_ticket.php
+++ b/submit_ticket.php
@@ -448,7 +448,7 @@ $tmpvar['latitude'] = hesk_POST('latitude');
 $tmpvar['longitude'] = hesk_POST('longitude');
 
 // Set html
-$tmpvar['html'] = $modsForHesk_settings['rich_text_for_tickets'];
+$tmpvar['html'] = $modsForHesk_settings['rich_text_for_tickets_for_customers'];
 
 // Should the helpdesk validate emails?
 $createTicket = true;
diff --git a/ticket.php b/ticket.php
index 3c39a94c..78d30d0b 100644
--- a/ticket.php
+++ b/ticket.php
@@ -606,7 +606,7 @@ function hesk_printCustomerReplyForm($reopen=0)
             <label for="message" class="col-sm-3 control-label"><?php echo $hesklang['message']; ?>: <span class="important">*</span></label>
             <div class="col-sm-9">
                 <textarea name="message" class="form-control htmlEditor" rows="12" cols="60"><?php if (isset($_SESSION['ticket_message'])) {echo stripslashes(hesk_input($_SESSION['ticket_message']));} ?></textarea>
-                <?php if ($modsForHesk_settings['rich_text_for_tickets']): ?>
+                <?php if ($modsForHesk_settings['rich_text_for_tickets_for_customers']): ?>
                     <script type="text/javascript">
                         /* <![CDATA[ */
                         tinyMCE.init({