diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf
index db87b39fd31..79c044533a2 100644
--- a/boot/bootdata/hivesft.inf
+++ b/boot/bootdata/hivesft.inf
@@ -525,7 +525,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IME Compatibility",,0x0000001
 
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IMM","IME File",2,"msctfime.ime"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IMM","LoadIMM",0x00010003,0 ; "LoadIMM" means Cicero despite its name
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IMM","LoadCTFIME",0x00010003,0
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\IMM","DontLoadCTFIME",0x00010003,1 ; Disable CTF IME
 
 ; DOS Device ports
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Ports","COM1:",2,"9600,n,8,1"
diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h
index aee14438476..0ffa9ea15d9 100644
--- a/win32ss/include/ntuser.h
+++ b/win32ss/include/ntuser.h
@@ -948,7 +948,7 @@ typedef LONG_PTR
 #define SRVINFO_DBCSENABLED 0x0002
 #define SRVINFO_IMM32       0x0004
 #define SRVINFO_APIHOOK     0x0010
-#define SRVINFO_CICERO_ENABLED 0x0020
+#define SRVINFO_CTFIME_ENABLED 0x0020
 #define SRVINFO_KBDPREF     0x0080
 
 #define NUM_SYSCOLORS 31
@@ -1210,7 +1210,7 @@ typedef struct tagCURSORDATA
 #define COMPAT_FLAG_2_CICERO_DISABLED 2
 
 #define IS_IMM_MODE() (gpsi && (gpsi->dwSRVIFlags & SRVINFO_IMM32))
-#define IS_CICERO_MODE() (gpsi && (gpsi->dwSRVIFlags & SRVINFO_CICERO_ENABLED))
+#define IS_CICERO_MODE() (gpsi && (gpsi->dwSRVIFlags & SRVINFO_CTFIME_ENABLED))
 #define IS_16BIT_MODE() (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT)
 #define IS_CICERO_COMPAT_DISABLED() \
     (GetWin32ClientInfo()->dwCompatFlags2 & COMPAT_FLAG_2_CICERO_DISABLED)
diff --git a/win32ss/user/ntuser/metric.c b/win32ss/user/ntuser/metric.c
index e070bb0fa51..5de0ce3c54d 100644
--- a/win32ss/user/ntuser/metric.c
+++ b/win32ss/user/ntuser/metric.c
@@ -28,16 +28,12 @@ BOOL FASTCALL UserIsIMMEnabled(VOID)
     return !!RegGetSectionDWORD(L"IMM", L"LoadIMM", FALSE);
 }
 
-BOOL FASTCALL UserIsCiceroEnabled(VOID)
+BOOL FASTCALL UserIsCTFIMEEnabled(VOID)
 {
-#if 1
-    return FALSE; /* FIXME: Cicero is not supported yet */
-#else
     if (RegGetSectionDWORD(L"IMM", L"DontLoadCTFIME", FALSE))
         return FALSE;
 
     return UserIsIMMEnabled();
-#endif
 }
 
 BOOL
@@ -201,8 +197,8 @@ InitMetrics(VOID)
     if (UserIsIMMEnabled())
         gpsi->dwSRVIFlags |= SRVINFO_IMM32; /* IME Support */
 
-    if (UserIsCiceroEnabled())
-        gpsi->dwSRVIFlags |= SRVINFO_CICERO_ENABLED; /* Cicero support */
+    if (UserIsCTFIMEEnabled())
+        gpsi->dwSRVIFlags |= SRVINFO_CTFIME_ENABLED; /* CTF IME support */
 
     Setup = TRUE;
 
diff --git a/win32ss/user/ntuser/userfuncs.h b/win32ss/user/ntuser/userfuncs.h
index 9967f843b53..6281d27dd04 100644
--- a/win32ss/user/ntuser/userfuncs.h
+++ b/win32ss/user/ntuser/userfuncs.h
@@ -85,7 +85,7 @@ BOOL NTAPI InitMetrics(VOID);
 LONG NTAPI UserGetSystemMetrics(ULONG Index);
 BOOL FASTCALL UserIsDBCSEnabled(VOID);
 BOOL FASTCALL UserIsIMMEnabled(VOID);
-BOOL FASTCALL UserIsCiceroEnabled(VOID);
+BOOL FASTCALL UserIsCTFIMEEnabled(VOID);
 
 /*************** KEYBOARD.C ***************/