diff --git a/include/kernel/handles.hpp b/include/kernel/handles.hpp
index 8731ee33..256ae02b 100644
--- a/include/kernel/handles.hpp
+++ b/include/kernel/handles.hpp
@@ -17,7 +17,8 @@ namespace KernelHandles {
 		BOSS, // Streetpass stuff?
 		CAM,  // Camera service
 		CECD, // More Streetpass stuff?
-		CFG,  // CFG service (Console & region info)
+		CFG_U,  // CFG service (Console & region info)
+		CFG_I,
 		DLP_SRVR, // Download Play: Server. Used for network play.
 		DSP,  // DSP service (Used for audio decoding and output)
 		HID,  // HID service (Handles input-related things including gyro. Does NOT handle New3DS controls or CirclePadPro)
@@ -67,7 +68,8 @@ namespace KernelHandles {
 			case BOSS: return "BOSS";
 			case CAM: return "CAM";
 			case CECD: return "CECD";
-			case CFG: return "CFG";
+			case CFG_U: return "CFG:U";
+			case CFG_I: return "CFG:I";
 			case DSP: return "DSP";
 			case DLP_SRVR: return "DLP::SRVR";
 			case HID: return "HID";
diff --git a/include/services/cfg.hpp b/include/services/cfg.hpp
index 666e8b23..c8c8adde 100644
--- a/include/services/cfg.hpp
+++ b/include/services/cfg.hpp
@@ -7,7 +7,6 @@
 #include "result/result.hpp"
 
 class CFGService {
-	Handle handle = KernelHandles::CFG;
 	Memory& mem;
 	CountryCodes country = CountryCodes::US; // Default to USA
 	MAKE_LOG_FUNCTION(log, cfgLogger)
diff --git a/src/core/services/service_manager.cpp b/src/core/services/service_manager.cpp
index f63d7ff5..56ae6637 100644
--- a/src/core/services/service_manager.cpp
+++ b/src/core/services/service_manager.cpp
@@ -97,7 +97,8 @@ static std::map<std::string, Handle> serviceMap = {
 	{ "boss:U", KernelHandles::BOSS },
 	{ "cam:u", KernelHandles::CAM },
 	{ "cecd:u", KernelHandles::CECD },
-	{ "cfg:u", KernelHandles::CFG },
+	{ "cfg:u", KernelHandles::CFG_U },
+	{ "cfg:i", KernelHandles::CFG_I },
 	{ "dlp:SRVR", KernelHandles::DLP_SRVR },
 	{ "dsp::DSP", KernelHandles::DSP },
 	{ "hid:USER", KernelHandles::HID },
@@ -184,7 +185,7 @@ void ServiceManager::sendCommandToService(u32 messagePointer, Handle handle) {
         case KernelHandles::BOSS: boss.handleSyncRequest(messagePointer); break;
 		case KernelHandles::CAM: cam.handleSyncRequest(messagePointer); break;
 		case KernelHandles::CECD: cecd.handleSyncRequest(messagePointer); break;
-		case KernelHandles::CFG: cfg.handleSyncRequest(messagePointer); break;
+		case KernelHandles::CFG_U: cfg.handleSyncRequest(messagePointer); break;
 		case KernelHandles::DLP_SRVR: dlp_srvr.handleSyncRequest(messagePointer); break;
 		case KernelHandles::HID: hid.handleSyncRequest(messagePointer); break;
 		case KernelHandles::HTTP: http.handleSyncRequest(messagePointer); break;