diff --git a/src/ui/game_screen.cpp b/src/ui/game_screen.cpp
index f4f8cd11..44d02cb1 100644
--- a/src/ui/game_screen.cpp
+++ b/src/ui/game_screen.cpp
@@ -19600,8 +19600,16 @@ std::string GameScreen::replaceGenderPlaceholders(const std::string& text, game:
         pos += replacement.length();
     }
 
+    // Resolve class and race names for $C and $R placeholders
+    std::string className = "Adventurer";
+    std::string raceName = "Unknown";
+    if (character) {
+        className = game::getClassName(character->characterClass);
+        raceName = game::getRaceName(character->race);
+    }
+
     // Replace simple placeholders.
-    // $n = player name
+    // $n/$N = player name, $c/$C = class name, $r/$R = race name
     // $p = subject pronoun (he/she/they)
     // $o = object pronoun (him/her/them)
     // $s = possessive adjective (his/her/their)
@@ -19615,6 +19623,8 @@ std::string GameScreen::replaceGenderPlaceholders(const std::string& text, game:
         std::string replacement;
         switch (code) {
             case 'n': case 'N': replacement = playerName; break;
+            case 'c': case 'C': replacement = className; break;
+            case 'r': case 'R': replacement = raceName; break;
             case 'p': replacement = pronouns.subject; break;
             case 'o': replacement = pronouns.object; break;
             case 's': replacement = pronouns.possessive; break;
diff --git a/src/ui/quest_log_screen.cpp b/src/ui/quest_log_screen.cpp
index 92b52bd9..fe5cd2cb 100644
--- a/src/ui/quest_log_screen.cpp
+++ b/src/ui/quest_log_screen.cpp
@@ -82,6 +82,14 @@ std::string replaceGenderPlaceholders(const std::string& text, game::GameHandler
         pos += replacement.length();
     }
 
+    // Resolve class and race names for $C and $R placeholders
+    std::string className = "Adventurer";
+    std::string raceName = "Unknown";
+    if (character) {
+        className = game::getClassName(character->characterClass);
+        raceName = game::getRaceName(character->race);
+    }
+
     // Replace simple placeholders
     pos = 0;
     while ((pos = result.find('$', pos)) != std::string::npos) {
@@ -92,11 +100,12 @@ std::string replaceGenderPlaceholders(const std::string& text, game::GameHandler
 
         switch (code) {
             case 'n': case 'N': replacement = playerName; break;
+            case 'c': case 'C': replacement = className; break;
+            case 'r': case 'R': replacement = raceName; break;
             case 'p': replacement = pronouns.subject; break;
             case 'o': replacement = pronouns.object; break;
             case 's': replacement = pronouns.possessive; break;
             case 'S': replacement = pronouns.possessiveP; break;
-            case 'r': replacement = pronouns.object; break;
             case 'b': case 'B': replacement = "\n"; break;
             case 'g': case 'G': pos++; continue;
             default: pos++; continue;