diff --git a/admin/edit_post.php b/admin/edit_post.php
index a0bc7c55..8e14c90a 100644
--- a/admin/edit_post.php
+++ b/admin/edit_post.php
@@ -368,7 +368,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             <label for="subject" class="col-sm-3 control-label"><?php echo $hesklang['subject'] . $required; ?></label>
 
                             <div class="col-sm-9">
-                                <input class="form-control" type="text" name="subject" size="40" maxlength="40"
+                                <input class="form-control" type="text" name="subject" size="40" maxlength="70"
                                        value="<?php echo $ticket['subject']; ?>"
                                        placeholder="<?php echo htmlspecialchars($hesklang['subject']); ?>"/>
                             </div>
@@ -380,7 +380,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             </label>
 
                             <div class="col-sm-9">
-                                <input class="form-control" type="text" name="name" size="40" maxlength="30"
+                                <input class="form-control" type="text" name="name" size="40" maxlength="50"
                                        value="<?php echo $ticket['name']; ?>"
                                        placeholder="<?php echo htmlspecialchars($hesklang['name']); ?>"
                                        data-error="<?php echo $hesklang['this_field_is_required']; ?>"
diff --git a/api/BusinessLogic/Emails/EmailTemplateParser.php b/api/BusinessLogic/Emails/EmailTemplateParser.php
index 287a1915..13cf48cf 100644
--- a/api/BusinessLogic/Emails/EmailTemplateParser.php
+++ b/api/BusinessLogic/Emails/EmailTemplateParser.php
@@ -252,12 +252,7 @@ class EmailTemplateParser extends \BaseClass {
         $lastReplyBy = '';
         // Get the last reply by
         if (!empty($ticket->lastReplier)) {
-            if (!empty($ticket->lastReplier)) {
-                $lastReplyBy = $hesklang['staff'];
-            } else {
-                $lastReplyUser = $this->userGateway->getUserById($ticket->lastReplier, $heskSettings);
-                $lastReplyBy = $lastReplyUser !== null ? $lastReplyUser->name : $hesklang['unas'];
-            }
+            $lastReplyBy = $ticket->lastReplier;
         } else {
             $lastReplyBy = $ticket->name;
         }
diff --git a/api/Controllers/Tickets/ResendTicketEmailToCustomerController.php b/api/Controllers/Tickets/ResendTicketEmailToCustomerController.php
index ddab20cc..42ac4c08 100644
--- a/api/Controllers/Tickets/ResendTicketEmailToCustomerController.php
+++ b/api/Controllers/Tickets/ResendTicketEmailToCustomerController.php
@@ -41,6 +41,10 @@ class ResendTicketEmailToCustomerController extends InternalApiController {
 
         $reply = null;
         $emailTemplate = EmailTemplateRetriever::NEW_TICKET;
+
+        // Use 0 for new tickets
+        $ticket->lastReplier = 0;
+
         if (isset($_GET['replyId'])) {
             $replyId = $_GET['replyId'];
             $emailTemplate = EmailTemplateRetriever::NEW_REPLY_BY_STAFF;