diff --git a/Assets/dll/melonDS.wbx.zst b/Assets/dll/melonDS.wbx.zst
index bb57e55659..a3f4403ec1 100644
Binary files a/Assets/dll/melonDS.wbx.zst and b/Assets/dll/melonDS.wbx.zst differ
diff --git a/waterbox/melon/BizFileManager.cpp b/waterbox/melon/BizFileManager.cpp
index 0763a7c683..0674a9f1d0 100644
--- a/waterbox/melon/BizFileManager.cpp
+++ b/waterbox/melon/BizFileManager.cpp
@@ -338,13 +338,13 @@ const char* InitNAND(FirmwareSettings& fwSettings, bool clearNand, bool dsiWare)
 		{
 			SanitizeNANDSettings(settings);
 			memset(settings.Nickname, 0, sizeof(settings.Nickname));
-			memcpy(settings.Nickname, fwSettings.Username, fwSettings.UsernameLength);
+			memcpy(settings.Nickname, fwSettings.Username, fwSettings.UsernameLength * 2);
 			settings.Language = static_cast<SPI_Firmware::Language>(fwSettings.Language & SPI_Firmware::Language::Reserved);
 			settings.FavoriteColor = fwSettings.Color;
 			settings.BirthdayMonth = fwSettings.BirthdayMonth;
 			settings.BirthdayDay = fwSettings.BirthdayDay;
 			memset(settings.Message, 0, sizeof(settings.Message));
-			memcpy(settings.Message, fwSettings.Message, fwSettings.MessageLength);
+			memcpy(settings.Message, fwSettings.Message, fwSettings.MessageLength * 2);
 		}
 
 		settings.TouchCalibrationADC1[0] = 0;