diff --git a/include/ajax.tickets.php b/include/ajax.tickets.php
index 3338ea4c536f334dcf73df470ecb62d2182b6e37..beb0c56135347e2ce559add0e351e9259ee02aed 100644
--- a/include/ajax.tickets.php
+++ b/include/ajax.tickets.php
@@ -1285,7 +1285,7 @@ function refer($tid, $target=null) {
                 case 'unanswered':
                     if(!$ticket->isAnswered())
                         $errors['err'] = __('Ticket is already marked as unanswered');
-                    elseif (!$ticket->markUnanswered())
+                    elseif (!$ticket->markUnAnswered())
                         $errors['err'] - __('Cannot mark ticket as unanswered');
                     break;
 
diff --git a/include/staff/templates/user-import.tmpl.php b/include/staff/templates/user-import.tmpl.php
index a1c47340b131e4487dbcae4e21451c381175f84d..3fc7d763f85974f0942fd0819bc7eec0920ac722 100644
--- a/include/staff/templates/user-import.tmpl.php
+++ b/include/staff/templates/user-import.tmpl.php
@@ -34,7 +34,7 @@ if ($org_id) { ?>
 'To import more other fields, use the Upload tab.'); ?></em>
 </p>
 <textarea name="pasted" style="display:block;width:100%;height:8em"
-    placeholder="<?php echo __('e.g. John Doe, john.doe@osticket.com'); ?>">
+    placeholder="<?php echo __('Name, Email'. PHP_EOL. ' John Doe, john.doe@osticket.com'); ?>">
 <?php echo $info['pasted']; ?>
 </textarea>
 </div>
diff --git a/include/staff/templates/user-lookup.tmpl.php b/include/staff/templates/user-lookup.tmpl.php
index f46fd7c99e9e4689183998212220730b6485973f..a5908e0c0a6aa023d97d8488a63b8bb15e854e20 100644
--- a/include/staff/templates/user-lookup.tmpl.php
+++ b/include/staff/templates/user-lookup.tmpl.php
@@ -84,7 +84,7 @@ if ($user) { ?>
     <table width="100%" class="fixed">
     <?php
         $form = $form ?: UserForm::getInstance();
-        $form->render(true, __('Create New User'), array('mode' => 'create')); ?>
+        $form->render(['staff' => true, 'title' => __('Create New User'), 'mode' => 'create']); ?>
     </table>
     <hr>
     <p class="full-width">
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index bc1573f354b5358d458d6962c8bca8b27d583680..4f0c78ac09bdadbbbb29f5bbc2d9317dcde0a81a 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -162,8 +162,8 @@ if($ticket->isOverdue())
                             echo __('Mark as Overdue'); ?></a></li>
                     <?php
                     }
-                 } elseif($ticket->isOpen() && $canAnswer) {
-
+                 }
+                 if($ticket->isOpen() && $canAnswer) {
                     if($ticket->isAnswered()) { ?>
                     <li><a href="#tickets/<?php echo $ticket->getId();
                         ?>/mark/unanswered" class="ticket-action"