diff --git a/allianceauth/services/hooks.py b/allianceauth/services/hooks.py
index 6318fdf9..7eae2371 100644
--- a/allianceauth/services/hooks.py
+++ b/allianceauth/services/hooks.py
@@ -160,6 +160,7 @@ class NameFormatter:
             'corp_id': getattr(main_char, 'corporation_id', None),
             'alliance_name': getattr(main_char, 'alliance_name', None),
             'alliance_id': getattr(main_char, 'alliance_id', None),
+            'alliance_ticker': None,
             'username': self.user.username,
         }
 
@@ -168,7 +169,9 @@ class NameFormatter:
             try:
                 format_data['alliance_ticker'] = getattr(getattr(main_char, 'alliance', None), 'alliance_ticker', None)
             except ObjectDoesNotExist:
-                format_data['alliance_ticker'] = None
+                pass
+        format_data['alliance_or_corp_name'] = format_data['alliance_name'] or format_data['corp_name']
+        format_data['alliance_or_corp_ticker'] = format_data['alliance_ticker'] or format_data['corp_ticker']
         return format_data
 
     @cached_property
diff --git a/docs/features/nameformats.md b/docs/features/nameformats.md
index 707f710a..e26837a9 100644
--- a/docs/features/nameformats.md
+++ b/docs/features/nameformats.md
@@ -53,6 +53,8 @@ The following fields are available from a users account and main character:
  - `alliance_id`
  - `alliance_name`
  - `alliance_ticker`
+ - `alliance_or_corp_name` (defaults to corp name if there is no alliance)
+ - `alliance_or_corp_ticker` (defaults to corp ticker if there is no alliance)
 
 ## Building a formatter string