diff --git a/wxt_cidrbot/git_api_handler.py b/wxt_cidrbot/git_api_handler.py
index 1e06e46..9bb62c2 100644
--- a/wxt_cidrbot/git_api_handler.py
+++ b/wxt_cidrbot/git_api_handler.py
@@ -441,6 +441,9 @@ def git_assign(self, repo, issue_number, search_name, assign_status, name_sim):
         if self.check_github_user(search_name) is False:
             return f"Invalid username: {search_name}"
 
+        if name_sim is None:
+            name_sim = "".join([str(x) for x in [search_name]])
+
         notify_user_status = False
 
         all_room_users = self.dynamo.user_dict(self.room_id)
@@ -463,6 +466,7 @@ def git_assign(self, repo, issue_number, search_name, assign_status, name_sim):
             if assign_status == "assign":
                 issue.add_to_assignees(search_name)
                 message = f"{hyperlink_format} successfully assigned to " + name_sim
+
                 if notify_user_status:
                     direct_message = (
                         f"Hello {name_sim}, the following issue was just assigned to you: {hyperlink_format}," +
diff --git a/wxt_cidrbot/git_webhook_handler.py b/wxt_cidrbot/git_webhook_handler.py
index 8ca9ccb..d6b6146 100644
--- a/wxt_cidrbot/git_webhook_handler.py
+++ b/wxt_cidrbot/git_webhook_handler.py
@@ -160,12 +160,13 @@ def triage_issue(self, installation_id, json_string, x_event_type, converted_fro
         issue_title = json_string[query_key]['title']
         issue_url = json_string[query_key]['html_url']
         issue_user = json_string[query_key]['user']['login']
+        actor = json_string['sender']['login']
         repo_name = json_string['repository']['full_name']
         repo_url = json_string['repository']['html_url']
 
         hyperlink_format = f'<a href="{issue_url}">{issue_title}</a>'
         hyperlink_format_repo = f'<a href="{repo_url}">{repo_name}</a>'
-        message = f"{issue_type} {hyperlink_format} {pull_request_action_msg} {hyperlink_format_repo} by {issue_user}. Performing automated triage:"
+        message = f"{issue_type} {hyperlink_format} {pull_request_action_msg} {hyperlink_format_repo} by {actor}. Performing automated triage:"
 
         token_dict = self.dynamo.get_repo_keys(room_id, repo_name)
         token = token_dict[repo_name]