diff --git a/agent/ticket.php b/agent/ticket.php
index f3f50b7e..03333082 100644
--- a/agent/ticket.php
+++ b/agent/ticket.php
@@ -620,7 +620,7 @@ if (isset($_GET['ticket_id'])) {
                                 <textarea
                                     class="form-control tinymceTicket" name="ticket_reply"
                                     placeholder="Type a response">
-                                    <?php echo nl2br(getFieldById('user_settings',$session_user_id,'user_config_signature','html')); ?>
+                                    <?php echo getFieldById('user_settings',$session_user_id,'user_config_signature','html'); ?>
                                 </textarea>
                             </div>
 
diff --git a/agent/user/post/profile.php b/agent/user/post/profile.php
index f730bdb6..ab781f7b 100644
--- a/agent/user/post/profile.php
+++ b/agent/user/post/profile.php
@@ -12,7 +12,7 @@ if (isset($_POST['edit_your_user_details'])) {
 
     $name = sanitizeInput($_POST['name']);
     $email = sanitizeInput($_POST['email']);
-    $signature = sanitizeInput($_POST['signature']);
+    $signature = mysqli_escape_string($mysqli,$_POST['signature']);
 
     $existing_file_name = sanitizeInput(getFieldById('users', $session_user_id, 'user_avatar'));
 
diff --git a/agent/user/user_details.php b/agent/user/user_details.php
index d5c1ac25..1a6bb0a4 100644
--- a/agent/user/user_details.php
+++ b/agent/user/user_details.php
@@ -58,12 +58,8 @@ require_once "includes/inc_all_user.php";
 
                     <div class="form-group">
                         <label>Signature</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-pen"></i></span>
-                            </div>
-                            <textarea class="form-control" name="signature" rows="4" placeholder="Create a signature automatically appended to tickets, emails etc"><?php echo getFieldById('user_settings',$session_user_id,'user_config_signature','html'); ?></textarea>
-                        </div>
+                        <textarea class="form-control tinymceTicket" name="signature" rows="4" placeholder="Create a signature automatically appended to tickets, emails etc"><?php echo getFieldById('user_settings',$session_user_id,'user_config_signature','html'); ?>
+                        </textarea>
                     </div>
                     
                     <button type="submit" name="edit_your_user_details" class="btn btn-primary btn-responsive"><i class="fas fa-check mr-2"></i>Save</button>