diff --git a/src/glue/CCharacterCreation.cpp b/src/glue/CCharacterCreation.cpp
index 9b7c676..548d5de 100644
--- a/src/glue/CCharacterCreation.cpp
+++ b/src/glue/CCharacterCreation.cpp
@@ -194,7 +194,16 @@ void CCharacterCreation::ResetCharCustomizeInfo() {
 
     CCharacterCreation::s_raceIndex = -1;
 
-    // TODO race and name gen stuff
+    for (int32_t i = 0; i < CCharacterCreation::s_races.Count(); i++) {
+        auto raceID = CCharacterCreation::s_races[i];
+
+        if (CCharacterCreation::s_character->m_data.raceID == raceID) {
+            CCharacterCreation::s_raceIndex = i;
+            break;
+        }
+    }
+
+    // TODO name gen stuff
 
     CGlueLoading::StartLoad(CCharacterCreation::s_character, true);
 }