diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp
index 66c71cc04..7f670ff79 100644
--- a/UI/obs-app.cpp
+++ b/UI/obs-app.cpp
@@ -1293,7 +1293,7 @@ bool OBSApp::OBSInit()
 	obs_set_ui_task_handler(ui_task_handler);
 
 #if defined(_WIN32) || defined(__APPLE__)
-	bool browserHWAccel = config_get_bool(userConfig, "General", "BrowserHWAccel");
+	bool browserHWAccel = config_get_bool(appConfig, "General", "BrowserHWAccel");
 
 	OBSDataAutoRelease settings = obs_data_create();
 	obs_data_set_bool(settings, "BrowserHWAccel", browserHWAccel);
@@ -1544,7 +1544,7 @@ static void delete_oldest_file(bool has_prefix, const char *location)
 	uint64_t oldest_ts = (uint64_t)-1;
 	struct os_dirent *entry;
 
-	unsigned int maxLogs = (unsigned int)config_get_uint(App()->GetUserConfig(), "General", "MaxLogs");
+	unsigned int maxLogs = (unsigned int)config_get_uint(App()->GetAppConfig(), "General", "MaxLogs");
 
 	os_dir_t *dir = os_opendir(logDir);
 	if (dir) {
diff --git a/UI/window-basic-interaction.cpp b/UI/window-basic-interaction.cpp
index 449da655f..93d572c5b 100644
--- a/UI/window-basic-interaction.cpp
+++ b/UI/window-basic-interaction.cpp
@@ -42,8 +42,8 @@ OBSBasicInteraction::OBSBasicInteraction(QWidget *parent, OBSSource source_)
 	  renamedSignal(obs_source_get_signal_handler(source), "rename", OBSBasicInteraction::SourceRenamed, this),
 	  eventFilter(BuildEventFilter())
 {
-	int cx = (int)config_get_int(App()->GetUserConfig(), "InteractionWindow", "cx");
-	int cy = (int)config_get_int(App()->GetUserConfig(), "InteractionWindow", "cy");
+	int cx = (int)config_get_int(App()->GetAppConfig(), "InteractionWindow", "cx");
+	int cy = (int)config_get_int(App()->GetAppConfig(), "InteractionWindow", "cy");
 
 	Qt::WindowFlags flags = windowFlags();
 	Qt::WindowFlags helpFlag = Qt::WindowContextHelpButtonHint;
diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
index 0616a5fa9..280efa9dc 100644
--- a/UI/window-basic-main.cpp
+++ b/UI/window-basic-main.cpp
@@ -2313,7 +2313,7 @@ void OBSBasic::OBSInit()
 	disableColorSpaceConversion(this);
 #endif
 
-	bool has_last_version = config_has_user_value(App()->GetUserConfig(), "General", "LastVersion");
+	bool has_last_version = config_has_user_value(App()->GetAppConfig(), "General", "LastVersion");
 	bool first_run = config_get_bool(App()->GetUserConfig(), "General", "FirstRun");
 
 	if (!first_run) {
@@ -2326,10 +2326,10 @@ void OBSBasic::OBSInit()
 
 #if (defined(_WIN32) || defined(__APPLE__)) && (OBS_RELEASE_CANDIDATE > 0 || OBS_BETA > 0)
 	/* Automatically set branch to "beta" the first time a pre-release build is run. */
-	if (!config_get_bool(App()->GetUserConfig(), "General", "AutoBetaOptIn")) {
-		config_set_string(App()->GetUserConfig(), "General", "UpdateBranch", "beta");
-		config_set_bool(App()->GetUserConfig(), "General", "AutoBetaOptIn", true);
-		config_save_safe(App()->GetUserConfig(), "tmp", nullptr);
+	if (!config_get_bool(App()->GetAppConfig(), "General", "AutoBetaOptIn")) {
+		config_set_string(App()->GetAppConfig(), "General", "UpdateBranch", "beta");
+		config_set_bool(App()->GetAppConfig(), "General", "AutoBetaOptIn", true);
+		config_save_safe(App()->GetAppConfig(), "tmp", nullptr);
 	}
 #endif
 	TimedCheckForUpdates();
@@ -3825,7 +3825,7 @@ void OBSBasic::TimedCheckForUpdates()
 {
 	if (App()->IsUpdaterDisabled())
 		return;
-	if (!config_get_bool(App()->GetUserConfig(), "General", "EnableAutoUpdates"))
+	if (!config_get_bool(App()->GetAppConfig(), "General", "EnableAutoUpdates"))
 		return;
 
 #if defined(ENABLE_SPARKLE_UPDATER)
diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp
index f4efc3e61..d8a35501b 100644
--- a/UI/window-basic-settings.cpp
+++ b/UI/window-basic-settings.cpp
@@ -1249,7 +1249,7 @@ void OBSBasicSettings::LoadGeneralSettings()
 	LoadLanguageList();
 
 #if defined(_WIN32) || defined(ENABLE_SPARKLE_UPDATER)
-	bool enableAutoUpdates = config_get_bool(App()->GetUserConfig(), "General", "EnableAutoUpdates");
+	bool enableAutoUpdates = config_get_bool(App()->GetAppConfig(), "General", "EnableAutoUpdates");
 	ui->enableAutoUpdates->setChecked(enableAutoUpdates);
 
 	LoadBranchesList();
@@ -2615,7 +2615,7 @@ void OBSBasicSettings::LoadAdvancedSettings()
 	ui->enableLowLatencyMode->setToolTip(QTStr("Basic.Settings.Advanced.Network.TCPPacing.Tooltip"));
 #endif
 #if defined(_WIN32) || defined(__APPLE__)
-	bool browserHWAccel = config_get_bool(App()->GetUserConfig(), "General", "BrowserHWAccel");
+	bool browserHWAccel = config_get_bool(App()->GetAppConfig(), "General", "BrowserHWAccel");
 	ui->browserHWAccel->setChecked(browserHWAccel);
 	prevBrowserAccel = ui->browserHWAccel->isChecked();
 #endif
@@ -2944,7 +2944,7 @@ void OBSBasicSettings::SaveGeneralSettings()
 
 #if defined(_WIN32) || defined(ENABLE_SPARKLE_UPDATER)
 	if (WidgetChanged(ui->enableAutoUpdates))
-		config_set_bool(App()->GetUserConfig(), "General", "EnableAutoUpdates",
+		config_set_bool(App()->GetAppConfig(), "General", "EnableAutoUpdates",
 				ui->enableAutoUpdates->isChecked());
 	int branchIdx = ui->updateChannelBox->currentIndex();
 	QString branchName = ui->updateChannelBox->itemData(branchIdx).toString();
@@ -3163,7 +3163,7 @@ void OBSBasicSettings::SaveAdvancedSettings()
 #endif
 #if defined(_WIN32) || defined(__APPLE__)
 	bool browserHWAccel = ui->browserHWAccel->isChecked();
-	config_set_bool(App()->GetUserConfig(), "General", "BrowserHWAccel", browserHWAccel);
+	config_set_bool(App()->GetAppConfig(), "General", "BrowserHWAccel", browserHWAccel);
 #endif
 
 	if (WidgetChanged(ui->hotkeyFocusType)) {