1 files changed, 3 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 7d623f69..b9919a2c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1548,8 +1548,6 @@ int main(int argc, char *argv[])
                     login_wallpaper->decRef();
                     login_wallpaper = ResourceManager::getInstance()->
                         getImage(wallpaperName);
-                    // Load units
-                    Units::loadUnits();
                     break;
 
                     // Those states don't cause a network disconnect
@@ -1594,6 +1592,9 @@ int main(int argc, char *argv[])
                     NPCDB::load();
                     EmoteDB::load();
 
+                    // Load units
+                    Units::loadUnits();
+
                     state = STATE_CHAR_CONNECT;
                     break;