diff --git a/colin-api/src/colin_api/models/filing.py b/colin-api/src/colin_api/models/filing.py
index 5d48055741..4aee7f2140 100644
--- a/colin-api/src/colin_api/models/filing.py
+++ b/colin-api/src/colin_api/models/filing.py
@@ -928,17 +928,24 @@ def _create_submitting_party(cls, cursor, filing, corp_num):
             mailing_addr_id = Address.create_new_address(
                 cursor=cursor, address_info=mailing_address, corp_num=corp_num)
 
+        if filed_by := filing.header.get('filedBy'):
+            last_name = filed_by.get('lastName')
+            first_name = filed_by.get('firstName')
+            if not first_name and not last_name:
+                last_name = filed_by.get('userName')  # if no names, use userName for last name
+
         submitting_party_query = \
             """
-            insert into submitting_party (event_id, mailing_addr_id, last_nme)
-            values (:event_id, :mailing_addr_id, :last_nme)
+            insert into submitting_party (event_id, mailing_addr_id, last_nme, first_nme)
+            values (:event_id, :mailing_addr_id, :last_nme, :first_nme)
             """
 
         cursor.execute(
             submitting_party_query,
             event_id=filing.event_id,
             mailing_addr_id=mailing_addr_id,
-            last_nme=filing.get_certified_by()[:20]
+            last_nme=last_name[:20],
+            first_nme=first_name[:20]
         )
 
     # pylint: disable=too-many-branches, too-many-locals, too-many-statements, too-many-nested-blocks;