diff --git a/post/ticket.php b/post/ticket.php
index 888eec17..cf11297c 100644
--- a/post/ticket.php
+++ b/post/ticket.php
@@ -31,7 +31,11 @@ if (isset($_POST['add_ticket'])) {
     if($ticket_template_id) {
         $sql = mysqli_query($mysqli, "SELECT * FROM ticket_templates WHERE ticket_template_id = $ticket_template_id");
         $row = mysqli_fetch_array($sql);
-        $subject = sanitizeInput($row['ticket_template_subject']);
+        
+        // Overide Template Subject
+        if(empty($subject)) {
+            $subject = sanitizeInput($row['ticket_template_subject']);
+        }
         $details = mysqli_escape_string($mysqli, $row['ticket_template_details']);
 
         // Get Associated Tasks from the ticket template
diff --git a/ticket_add_from_template_modal.php b/ticket_add_from_template_modal.php
index dd6a7038..899e3b49 100644
--- a/ticket_add_from_template_modal.php
+++ b/ticket_add_from_template_modal.php
@@ -64,6 +64,16 @@
                                 </div>
                             </div>
 
+                            <div class="form-group">
+                                <label>Override Subject</label>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" name="subject" placeholder="Fill this in to override the templates subject">
+                                </div>
+                            </div>
+
 
                             <?php if (empty($_GET['client_id'])) { ?>