diff --git a/src/LScreens.c b/src/LScreens.c
index b459e9161..1780a6478 100644
--- a/src/LScreens.c
+++ b/src/LScreens.c
@@ -1,4 +1,5 @@
 #include "LScreens.h"
+#ifndef CC_BUILD_WEB
 #include "LWidgets.h"
 #include "LWeb.h"
 #include "Launcher.h"
@@ -13,8 +14,8 @@
 #include "Window.h"
 #include "Input.h"
 #include "Options.h"
+#include "Game.h"
 
-#ifndef CC_BUILD_WEB
 /*########################################################################################################################*
 *---------------------------------------------------------Screen base-----------------------------------------------------*
 *#########################################################################################################################*/
@@ -918,6 +919,7 @@ static void MainScreen_TickSignIn(struct MainScreen* s) {
 			LInput_SetText(&s->iptUsername, &SignInTask.username);
 			LWidget_Redraw(&s->iptUsername);
 		}
+		String_Copy(&Game_Username, &SignInTask.username);
 
 		FetchServersTask_Run();
 		LLabel_SetConst(&s->lblStatus, "&eRetrieving servers list..");
diff --git a/src/LWeb.c b/src/LWeb.c
index 6cddcc033..52a50a836 100644
--- a/src/LWeb.c
+++ b/src/LWeb.c
@@ -1,4 +1,5 @@
 #include "LWeb.h"
+#ifndef CC_BUILD_WEB
 #include "Launcher.h"
 #include "Platform.h"
 #include "Stream.h"
@@ -8,7 +9,6 @@
 #include "PackedCol.h"
 #include "Errors.h"
 
-#ifndef CC_BUILD_WEB
 /*########################################################################################################################*
 *----------------------------------------------------------JSON-----------------------------------------------------------*
 *#########################################################################################################################*/
diff --git a/src/LWidgets.c b/src/LWidgets.c
index 64558b6a8..6523de16a 100644
--- a/src/LWidgets.c
+++ b/src/LWidgets.c
@@ -1,4 +1,5 @@
 #include "LWidgets.h"
+#ifndef CC_BUILD_WEB
 #include "Gui.h"
 #include "Drawer2D.h"
 #include "Launcher.h"
@@ -10,7 +11,6 @@
 #include "LScreens.h"
 #include "Input.h"
 
-#ifndef CC_BUILD_WEB
 static int xBorder, xBorder2, xBorder3, xBorder4;
 static int yBorder, yBorder2, yBorder3, yBorder4;
 static int xInputOffset, yInputOffset, inputExpand;
diff --git a/src/Launcher.c b/src/Launcher.c
index 0bf3325be..dd2476da2 100644
--- a/src/Launcher.c
+++ b/src/Launcher.c
@@ -1,4 +1,5 @@
 #include "Launcher.h"
+#ifndef CC_BUILD_WEB
 #include "LScreens.h"
 #include "LWidgets.h"
 #include "LWeb.h"
@@ -17,7 +18,6 @@
 #include "Logger.h"
 #include "Options.h"
 
-#ifndef CC_BUILD_WEB
 static struct LScreen* activeScreen;
 Rect2D Launcher_Dirty;
 struct Bitmap Launcher_Framebuffer;
@@ -117,7 +117,7 @@ CC_NOINLINE static void StartFromInfo(struct ServerInfo* info) {
 	String_InitArray(port, portBuffer);
 
 	String_AppendInt(&port, info->port);
-	Launcher_StartGame(&SignInTask.username, &info->mppass, &info->ip, &port, &info->name);
+	Launcher_StartGame(&Game_Username, &info->mppass, &info->ip, &port, &info->name);
 }
 
 cc_bool Launcher_ConnectToServer(const String* hash) {
diff --git a/src/Resources.c b/src/Resources.c
index 7b1d4fbab..39f9d5093 100644
--- a/src/Resources.c
+++ b/src/Resources.c
@@ -1,4 +1,5 @@
 #include "Resources.h"
+#ifndef CC_BUILD_WEB
 #include "Funcs.h"
 #include "String.h"
 #include "Constants.h"
@@ -12,7 +13,6 @@
 #include "Logger.h"
 #include "LWeb.h"
 
-#ifndef CC_BUILD_WEB
 /*########################################################################################################################*
 *--------------------------------------------------------Resources list---------------------------------------------------*
 *#########################################################################################################################*/