diff --git a/base/shell/cmd/cmdinput.c b/base/shell/cmd/cmdinput.c
index b5849c282a4..b888e6d8fb7 100644
--- a/base/shell/cmd/cmdinput.c
+++ b/base/shell/cmd/cmdinput.c
@@ -106,10 +106,10 @@
  * See https://technet.microsoft.com/en-us/library/cc978715.aspx
  * and https://technet.microsoft.com/en-us/library/cc940805.aspx
  * to know the differences between those two settings.
- * Values 0x00, 0x0D (carriage return) and 0x20 (space) disable completion.
+ * Values 0x00, 0x0D (carriage return) and >= 0x20 (space) disable completion.
  */
-TCHAR AutoCompletionChar = _T('\t'); // Default is 0x20
-TCHAR PathCompletionChar = _T('\t'); // Default is 0x20
+TCHAR AutoCompletionChar = 0x20; // Disabled by default
+TCHAR PathCompletionChar = 0x20; // Disabled by default
 
 
 SHORT maxx;
diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf
index 9cb6f780b1a..8bf049bff92 100644
--- a/boot/bootdata/hivedef.inf
+++ b/boot/bootdata/hivedef.inf
@@ -160,6 +160,11 @@ HKCU,"Control Panel\International\Geo",,0x00000012
 HKCU,"Control Panel\Cursors",,,"ReactOS Default"
 HKCU,"Control Panel\Cursors","Scheme Source",0x00010001,0x00000002
 
+; CMD Settings
+HKCU,"SOFTWARE\Microsoft\Command Processor","CompletionChar",0x00010001,0x09
+HKCU,"SOFTWARE\Microsoft\Command Processor","DefaultColor",0x00010001,0
+HKCU,"SOFTWARE\Microsoft\Command Processor","EnableExtensions",0x00010001,1
+
 ; PowerCfg
 HKCU,"Control Panel\PowerCfg","CurrentPowerPolicy",2,"0"
 HKCU,"Control Panel\PowerCfg\GlobalPowerPolicy","Policies",0x00030003,01,00,00,00,00,\
diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf
index bdcb5fa87cd..dde9d756a03 100644
--- a/boot/bootdata/hivesft.inf
+++ b/boot/bootdata/hivesft.inf
@@ -469,6 +469,10 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\BitBucket\Volume",,0x00
 
 ; CMD Settings
 HKLM,"SOFTWARE\Microsoft\Command Processor","AutoRun",0x00020000,""
+HKLM,"SOFTWARE\Microsoft\Command Processor","CompletionChar",0x00010001,0x40
+HKLM,"SOFTWARE\Microsoft\Command Processor","DefaultColor",0x00010001,0
+HKLM,"SOFTWARE\Microsoft\Command Processor","EnableExtensions",0x00010001,1
+HKLM,"SOFTWARE\Microsoft\Command Processor","PathCompletionChar",0x00010001,0x40
 
 ; Uninstall Application list
 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall",,0x00000012