diff --git a/src/main/java/inf112/fiasko/roborally/game_wrapper/ScreenManager.java b/src/main/java/inf112/fiasko/roborally/game_wrapper/ScreenManager.java
index f35a839..50e0fc0 100644
--- a/src/main/java/inf112/fiasko/roborally/game_wrapper/ScreenManager.java
+++ b/src/main/java/inf112/fiasko/roborally/game_wrapper/ScreenManager.java
@@ -10,6 +10,8 @@ public class ScreenManager {
     private PowerDownScreen powerDownScreen;
     private LoadingScreen loadingScreen;
     private StartMenuScreen startMenuScreen;
+    private UsernameScreen usernameScreen;
+    private IPAddressScreen ipAddressScreen;
 
     /**
      * Gets an instance of the main menu screen
@@ -23,6 +25,20 @@ public class ScreenManager {
         return powerDownScreen;
     }
 
+    public synchronized IPAddressScreen getIPAddressScreen(RoboRallyWrapper roboRallyWrapper) {
+        if (this.ipAddressScreen == null) {
+            this.ipAddressScreen = new IPAddressScreen(roboRallyWrapper);
+        }
+        return ipAddressScreen;
+    }
+
+    public synchronized UsernameScreen getUsernameScreen(RoboRallyWrapper roboRallyWrapper) {
+        if (this.usernameScreen == null) {
+            this.usernameScreen = new UsernameScreen(roboRallyWrapper);
+        }
+        return usernameScreen;
+    }
+
     public synchronized StartMenuScreen getStartMenuScreen(RoboRallyWrapper roboRallyWrapper) {
         if (this.startMenuScreen == null) {
             this.startMenuScreen = new StartMenuScreen(roboRallyWrapper);