diff --git a/src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php b/src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php
index b07988ed..1a883fc4 100644
--- a/src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php
+++ b/src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php
@@ -340,11 +340,18 @@ public function saveAction()
             }
 
             try {
-                $admin = Mage::getModel('zendesk/api_users')->me();
+                $admin = Mage::getSingleton('admin/session')->getUser();
+                $submitter = Mage::getModel('zendesk/api_users')->find($admin->getEmail());
+
+                if (!$submitter) {
+                    // Default to the user set in the agent email field under Configuration
+                    $submitter = Mage::getModel('zendesk/api_users')->me();
+                }
+
                 $ticket = array(
                     'ticket' => array(
                         'requester_id' => $requesterId,
-                        'submitter_id' => $admin['id'],
+                        'submitter_id' => $submitter['id'],
                         'subject' => $data['subject'],
                         'status' => $data['status'],
                         'priority' => $data['priority'],