diff --git a/lib/Notifications/Shortcodes.php b/lib/Notifications/Shortcodes.php
index 189abb59..6560569b 100644
--- a/lib/Notifications/Shortcodes.php
+++ b/lib/Notifications/Shortcodes.php
@@ -117,6 +117,8 @@ protected function get_actor()
      *   - login
      *   - url
      *   - display_name
+     *   - first_name
+     *   - last_name
      *   - email
      *   - separator
      *
@@ -185,6 +187,14 @@ private function get_user_field($user, $field, $attrs)
                 $result = $user->display_name;
                 break;
 
+            case 'first_name':
+                $result = $user->first_name;
+                break;
+
+            case 'last_name':
+                $result = $user->last_name;
+                break;
+
             case 'email':
                 $result = $user->user_email;
                 break;
diff --git a/modules/improved-notifications/improved-notifications.php b/modules/improved-notifications/improved-notifications.php
index a72df55e..4f202c4c 100644
--- a/modules/improved-notifications/improved-notifications.php
+++ b/modules/improved-notifications/improved-notifications.php
@@ -903,6 +903,8 @@ private function getShortcodeActorFields()
                     'login',
                     'url',
                     'display_name',
+                    'first_name',
+                    'last_name',
                     'email',
                 ]
             );