diff --git a/src/Launcher.c b/src/Launcher.c
index 71f2049b9..f525851a6 100644
--- a/src/Launcher.c
+++ b/src/Launcher.c
@@ -299,7 +299,7 @@ void Launcher_Run(void) {
 	Drawer2D_BlackTextShadows = true;
 	InitFramebuffer();
 
-	Options_UNSAFE_Get("launcher-cc-username", &Game_Username);
+	Options_Get("launcher-cc-username", &Game_Username, "");
 	Session_Load();
 	Launcher_LoadSkin();
 	Launcher_Init();
diff --git a/src/Utils.c b/src/Utils.c
index 8f1c9c52d..f850bb036 100644
--- a/src/Utils.c
+++ b/src/Utils.c
@@ -224,7 +224,7 @@ int Convert_FromBase64(const char* src, int len, cc_uint8* dst) {
 *--------------------------------------------------------EntryList--------------------------------------------------------*
 *#########################################################################################################################*/
 void EntryList_Load(struct StringsBuffer* list, const char* file, char separator, EntryList_Filter filter) {
-	cc_string entry; char entryBuffer[768];
+	cc_string entry; char entryBuffer[1024];
 	cc_string path;
 	cc_string key, value;
 	int lineLen, maxLen;