diff --git a/src/components/forms/ticket-form.js b/src/components/forms/ticket-form.js
index 3ab4eca17..4043ae33d 100644
--- a/src/components/forms/ticket-form.js
+++ b/src/components/forms/ticket-form.js
@@ -89,6 +89,9 @@ class TicketForm extends React.Component {
     if (id === "ticket_type") {
       shouldShowSave = !(value == null);
     }
+    if (ev.target.type === "ownerinput") {
+      entity.attendee_company = ev.target.value?.company || "";
+    }
 
     entity[id] = value;
     this.setState({
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 2442a8e39..7cfa6e111 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1765,6 +1765,7 @@
     "tax_name_rate": "{tax_name} Rate",
     "tax_name_price": "{tax_name} Price",
     "purchase_ticket_price": "Purchase Ticket Price",
+    "no_attendee": "This ticket is not assigned",
     "attendee_incomplete": "Attendee Info Incomplete",
     "attendee_incomplete_msg": "This attendee's ticket has not been issued because their information is incomplete.  Would you like to send a reminder for them to complete their information so the ticket can be issued?",
     "placeholders": {
diff --git a/src/pages/orders/edit-ticket-page.js b/src/pages/orders/edit-ticket-page.js
index d0fc51eee..ed384867a 100644
--- a/src/pages/orders/edit-ticket-page.js
+++ b/src/pages/orders/edit-ticket-page.js
@@ -125,6 +125,14 @@ const EditTicketPage = ({
   const handleResendEmail = (ticket, ev) => {
     ev.preventDefault();
 
+    if (!ticket.owner) {
+      return Swal.fire({
+        title: T.translate("general.error"),
+        text: T.translate("edit_ticket.no_attendee"),
+        type: "warning"
+      });
+    }
+
     if (ticket.owner.status === "Complete") {
       props.reSendTicketEmail(ticket.order_id, ticket.id);
     } else {