diff --git a/reactos/base/system/smss/sminit.c b/reactos/base/system/smss/sminit.c
index 2e0e006edee..1f28e5ff93e 100644
--- a/reactos/base/system/smss/sminit.c
+++ b/reactos/base/system/smss/sminit.c
@@ -630,8 +630,8 @@ SmpRegistryConfigurationTable[] =
         0,
         L"BootExecute",
         &SmpBootExecuteList,
-        REG_NONE,
-        NULL,
+        REG_MULTI_SZ,
+        L"autocheck AutoChk.exe *\0",
         0
     },
 
@@ -725,16 +725,6 @@ SmpRegistryConfigurationTable[] =
         0
     },
 
-    {
-        SmpConfigureEnvironment,
-        RTL_QUERY_REGISTRY_SUBKEY,
-        L"Environment",
-        NULL,
-        REG_NONE,
-        NULL,
-        0
-    },
-
     {
         SmpConfigureSubSystems,
         RTL_QUERY_REGISTRY_SUBKEY,
diff --git a/reactos/base/system/smss/smutil.c b/reactos/base/system/smss/smutil.c
index 667cbd1e7e4..e50f2ff3f7a 100644
--- a/reactos/base/system/smss/smutil.c
+++ b/reactos/base/system/smss/smutil.c
@@ -162,6 +162,9 @@ SmpParseToken(IN PUNICODE_STRING Input,
     /* Save the input length */
     InputLength = Input->Length;
 
+    /* If the input string is empty, just return */
+    if (InputLength == 0) return STATUS_SUCCESS;
+
     /* Parse the buffer until the first character */
     p = Input->Buffer;
     Length = 0;