diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9153197c..3685b7f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,7 +107,7 @@ if(ENABLE_QT_GUI)
     set(CMAKE_AUTOUIC ON)
 endif()
 
-set(AUDIO_CORE src/audio_core/sdl_audio.cpp 
+set(AUDIO_CORE src/audio_core/sdl_audio.cpp
                src/audio_core/sdl_audio.h
 )
 
@@ -527,34 +527,33 @@ set(EMULATOR src/emulator.cpp
 if(ENABLE_QT_GUI)
 qt_add_resources(RESOURCE_FILES src/shadps4.qrc)
 
-set(QT_GUI 
-    src/qt_gui/main_window_ui.h
-    src/qt_gui/main_window.cpp
-    src/qt_gui/main_window.h
-    src/qt_gui/gui_context_menus.h
-    src/qt_gui/game_list_utils.h
-    src/qt_gui/game_info.cpp
-    src/qt_gui/game_info.h
-    src/qt_gui/game_list_frame.cpp
-    src/qt_gui/game_list_frame.h
-    src/qt_gui/game_grid_frame.cpp
-    src/qt_gui/game_grid_frame.h
-    src/qt_gui/game_install_dialog.cpp
-    src/qt_gui/game_install_dialog.h
-    src/qt_gui/pkg_viewer.cpp
-    src/qt_gui/pkg_viewer.h
-    src/qt_gui/trophy_viewer.cpp
-    src/qt_gui/trophy_viewer.h
-    src/qt_gui/elf_viewer.cpp
-    src/qt_gui/elf_viewer.h
-    src/qt_gui/main_window_themes.cpp
-    src/qt_gui/main_window_themes.h
-    src/qt_gui/settings_dialog.cpp
-    src/qt_gui/settings_dialog.h
-    src/qt_gui/settings_dialog.ui
-    src/qt_gui/main.cpp
-    ${EMULATOR}
-    ${RESOURCE_FILES}
+set(QT_GUI src/qt_gui/main_window_ui.h
+           src/qt_gui/main_window.cpp
+           src/qt_gui/main_window.h
+           src/qt_gui/gui_context_menus.h
+           src/qt_gui/game_list_utils.h
+           src/qt_gui/game_info.cpp
+           src/qt_gui/game_info.h
+           src/qt_gui/game_list_frame.cpp
+           src/qt_gui/game_list_frame.h
+           src/qt_gui/game_grid_frame.cpp
+           src/qt_gui/game_grid_frame.h
+           src/qt_gui/game_install_dialog.cpp
+           src/qt_gui/game_install_dialog.h
+           src/qt_gui/pkg_viewer.cpp
+           src/qt_gui/pkg_viewer.h
+           src/qt_gui/trophy_viewer.cpp
+           src/qt_gui/trophy_viewer.h
+           src/qt_gui/elf_viewer.cpp
+           src/qt_gui/elf_viewer.h
+           src/qt_gui/main_window_themes.cpp
+           src/qt_gui/main_window_themes.h
+           src/qt_gui/settings_dialog.cpp
+           src/qt_gui/settings_dialog.h
+           src/qt_gui/settings_dialog.ui
+           src/qt_gui/main.cpp
+           ${EMULATOR}
+           ${RESOURCE_FILES}
 )
 endif()
 
diff --git a/src/common/config.cpp b/src/common/config.cpp
index a65a5b59..8ff29449 100644
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -16,6 +16,7 @@ static u32 screenHeight = 720;
 static s32 gpuId = -1; // Vulkan physical device index. Set to negative for auto select
 static std::string logFilter;
 static std::string logType = "async";
+static std::string userName = "shadPS4";
 static bool isDebugDump = false;
 static bool isLibc = true;
 static bool isShowSplash = false;
@@ -80,6 +81,10 @@ std::string getLogType() {
     return logType;
 }
 
+std::string getUserName() {
+    return userName;
+}
+
 bool debugDump() {
     return isDebugDump;
 }
@@ -313,6 +318,7 @@ void load(const std::filesystem::path& path) {
         isFullscreen = toml::find_or<bool>(general, "Fullscreen", false);
         logFilter = toml::find_or<std::string>(general, "logFilter", "");
         logType = toml::find_or<std::string>(general, "logType", "sync");
+        userName = toml::find_or<std::string>(general, "userName", "shadPS4");
         isShowSplash = toml::find_or<bool>(general, "showSplash", true);
     }
 
@@ -400,6 +406,7 @@ void save(const std::filesystem::path& path) {
     data["General"]["Fullscreen"] = isFullscreen;
     data["General"]["logFilter"] = logFilter;
     data["General"]["logType"] = logType;
+    data["General"]["userName"] = userName;
     data["General"]["showSplash"] = isShowSplash;
     data["GPU"]["screenWidth"] = screenWidth;
     data["GPU"]["screenHeight"] = screenHeight;
diff --git a/src/common/config.h b/src/common/config.h
index 97055028..6c954705 100644
--- a/src/common/config.h
+++ b/src/common/config.h
@@ -15,6 +15,7 @@ bool isNeoMode();
 bool isFullscreenMode();
 std::string getLogFilter();
 std::string getLogType();
+std::string getUserName();
 
 u32 getScreenWidth();
 u32 getScreenHeight();
diff --git a/src/core/libraries/np_manager/np_manager.cpp b/src/core/libraries/np_manager/np_manager.cpp
index fd4e31f5..c657fbf6 100644
--- a/src/core/libraries/np_manager/np_manager.cpp
+++ b/src/core/libraries/np_manager/np_manager.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 // Generated By moduleGenerator
+#include "common/config.h"
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/libs.h"
@@ -977,7 +978,7 @@ int PS4_SYSV_ABI sceNpGetGamePresenceStatusA() {
 int PS4_SYSV_ABI sceNpGetNpId(OrbisUserServiceUserId userId, OrbisNpId* npId) {
     LOG_ERROR(Lib_NpManager, "(DUMMY) called");
 
-    std::string name = "shadps4";
+    std::string name = Config::getUserName();
     strcpy(npId->handle.data, name.c_str());
     return ORBIS_OK;
 }
diff --git a/src/emulator.cpp b/src/emulator.cpp
index 034b8706..4990b4aa 100644
--- a/src/emulator.cpp
+++ b/src/emulator.cpp
@@ -10,6 +10,7 @@
 #include "common/ntapi.h"
 #include "common/path_util.h"
 #include "common/polyfill_thread.h"
+#include "common/scm_rev.h"
 #include "common/singleton.h"
 #include "common/version.h"
 #include "core/file_format/playgo_chunk.h"
@@ -26,7 +27,6 @@
 #include "core/linker.h"
 #include "core/memory.h"
 #include "emulator.h"
-#include "src/common/scm_rev.h"
 #include "video_core/renderdoc.h"
 
 Frontend::WindowSDL* g_window = nullptr;