diff --git a/apps/openmw/mwgui/window_manager.cpp b/apps/openmw/mwgui/window_manager.cpp
index 466c854260..a2b3a786f8 100644
--- a/apps/openmw/mwgui/window_manager.cpp
+++ b/apps/openmw/mwgui/window_manager.cpp
@@ -184,6 +184,7 @@ void WindowManager::updateVisible()
           removeDialog(raceDialog);
       raceDialog = new RaceDialog(environment, gui->getViewSize());
       raceDialog->setNextButtonShow(raceChosen);
+      raceDialog->setRaceId(playerRaceId);
       raceDialog->eventDone = MyGUI::newDelegate(this, &WindowManager::onRaceDialogDone);
       raceDialog->eventBack = MyGUI::newDelegate(this, &WindowManager::onRaceDialogBack);
       raceDialog->open();
@@ -212,6 +213,7 @@ void WindowManager::updateVisible()
           removeDialog(pickClassDialog);
       pickClassDialog = new PickClassDialog(environment, gui->getViewSize());
       pickClassDialog->setNextButtonShow(classChosen);
+      pickClassDialog->setClassId(playerClass.name);
       pickClassDialog->eventDone = MyGUI::newDelegate(this, &WindowManager::onPickClassDialogDone);
       pickClassDialog->eventBack = MyGUI::newDelegate(this, &WindowManager::onPickClassDialogBack);
       pickClassDialog->open();