diff --git a/reactos/base/applications/msconfig/freeldrpage.c b/reactos/base/applications/msconfig/freeldrpage.c
index 3646cd87d3d..78df77e17fa 100644
--- a/reactos/base/applications/msconfig/freeldrpage.c
+++ b/reactos/base/applications/msconfig/freeldrpage.c
@@ -1,6 +1,6 @@
 /*
  * PROJECT:     ReactOS Applications
- * LICENSE:     GPL - See COPYING in the top level directory
+ * LICENSE:     LGPL - See COPYING in the top level directory
  * FILE:        base/applications/freeldrpage.c
  * PURPOSE:     Freeloader configuration page message handler
  * COPYRIGHT:   Copyright 2005-2006 Christoph von Wittich <Christoph@ApiViewer.de>
diff --git a/reactos/base/applications/msconfig/generalpage.c b/reactos/base/applications/msconfig/generalpage.c
index 8554be3ba26..f0582ceccd9 100644
--- a/reactos/base/applications/msconfig/generalpage.c
+++ b/reactos/base/applications/msconfig/generalpage.c
@@ -1,6 +1,6 @@
 /*
  * PROJECT:     ReactOS Applications
- * LICENSE:     GPL - See COPYING in the top level directory
+ * LICENSE:     LGPL - See COPYING in the top level directory
  * FILE:        base/applications/generalpage.c
  * PURPOSE:     General page message handler
  * COPYRIGHT:   Copyright 2005-2006 Christoph von Wittich <Christoph@ApiViewer.de>
diff --git a/reactos/base/applications/msconfig/msconfig.c b/reactos/base/applications/msconfig/msconfig.c
index 1ffcc865d2c..8ee39f64a56 100644
--- a/reactos/base/applications/msconfig/msconfig.c
+++ b/reactos/base/applications/msconfig/msconfig.c
@@ -1,6 +1,6 @@
 /*
  * PROJECT:     ReactOS Applications
- * LICENSE:     GPL - See COPYING in the top level directory
+ * LICENSE:     LGPL - See COPYING in the top level directory
  * FILE:        base/applications/msconfig.c
  * PURPOSE:     msconfig main dialog
  * COPYRIGHT:   Copyright 2005-2006 Christoph von Wittich <Christoph@ApiViewer.de>
diff --git a/reactos/base/applications/msconfig/srvpage.c b/reactos/base/applications/msconfig/srvpage.c
index fbfbb4c10c5..53aad055040 100644
--- a/reactos/base/applications/msconfig/srvpage.c
+++ b/reactos/base/applications/msconfig/srvpage.c
@@ -1,6 +1,6 @@
 /*
  * PROJECT:     ReactOS Applications
- * LICENSE:     GPL - See COPYING in the top level directory
+ * LICENSE:     LGPL - See COPYING in the top level directory
  * FILE:        base/applications/srvpage.c
  * PURPOSE:     Services page message handler
  * COPYRIGHT:   Copyright 2005-2006 Christoph von Wittich <Christoph@ApiViewer.de>
diff --git a/reactos/base/applications/msconfig/startuppage.c b/reactos/base/applications/msconfig/startuppage.c
index d687344f38f..b30219fca4f 100644
--- a/reactos/base/applications/msconfig/startuppage.c
+++ b/reactos/base/applications/msconfig/startuppage.c
@@ -1,6 +1,6 @@
 /*
  * PROJECT:     ReactOS Applications
- * LICENSE:     GPL - See COPYING in the top level directory
+ * LICENSE:     LGPL - See COPYING in the top level directory
  * FILE:        base/applications/startuppage.c
  * PURPOSE:     Startup page message handler
  * COPYRIGHT:   Copyright 2005-2006 Christoph von Wittich <Christoph@ApiViewer.de>
@@ -116,25 +116,17 @@ GetDisabledAutostartEntriesFromRegistry (TCHAR * szBasePath)
                             dwDataLength = MAX_VALUE_NAME;
                             if(RegEnumValue(hSubKey, SubIndex, szSubValueName, &dwValueLength, NULL, NULL, (LPBYTE)Data, &dwDataLength) == ERROR_SUCCESS)
                             {
+                                item.iSubItem = -1;
                                 if (!_tcscmp(szSubValueName, _T("command")))
-                                {
-                                    GetLongPathName(Data, Data, (DWORD) _tcsclen(Data));
-                                    item.pszText = Data;
                                     item.iSubItem = 1;
-                                    SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item);
-                                }
                                 else if (!_tcscmp(szSubValueName, _T("key")) || !_tcscmp(szSubValueName, _T("location")))
-                                {
-                                    GetLongPathName(Data, Data, (DWORD) _tcsclen(Data));
-                                    item.pszText = Data;
                                     item.iSubItem = 2;
-                                    SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item);
-                                }
                                 else if (!_tcscmp(szSubValueName, _T("item")))
-                                {
+                                    item.iSubItem = 0;
+                                if (item.iSubItem != -1)
+								{
                                     GetLongPathName(Data, Data, (DWORD) _tcsclen(Data));
                                     item.pszText = Data;
-                                    item.iSubItem = 0;
                                     SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item);
                                 }
                             }
@@ -183,7 +175,7 @@ GetAutostartEntriesFromRegistry ( HKEY hRootKey, TCHAR* KeyName )
                     (void)ListView_InsertItem(hStartupListCtrl, &item);
                     ListView_SetCheckState(hStartupListCtrl, item.iItem, TRUE);
 
-                    if (dwType == REG_SZ)
+                    if ((dwType == REG_SZ) || (dwType == REG_EXPAND_SZ))
                     {
                         GetLongPathName(Data, Data, (DWORD) _tcsclen(Data));
                         item.pszText = Data;
diff --git a/reactos/base/applications/msconfig/systempage.c b/reactos/base/applications/msconfig/systempage.c
index e899c454bbe..60a451cddc0 100644
--- a/reactos/base/applications/msconfig/systempage.c
+++ b/reactos/base/applications/msconfig/systempage.c
@@ -1,6 +1,6 @@
 /*
  * PROJECT:     ReactOS Applications
- * LICENSE:     GPL - See COPYING in the top level directory
+ * LICENSE:     LGPL - See COPYING in the top level directory
  * FILE:        base/applications/systempage.c
  * PURPOSE:     System page message handler
  * COPYRIGHT:   Copyright 2005-2006 Christoph von Wittich <Christoph@ApiViewer.de>
diff --git a/reactos/base/applications/msconfig/toolspage.c b/reactos/base/applications/msconfig/toolspage.c
index 81d6bdd9a2c..0084bb620ea 100644
--- a/reactos/base/applications/msconfig/toolspage.c
+++ b/reactos/base/applications/msconfig/toolspage.c
@@ -1,6 +1,6 @@
 /*
  * PROJECT:     ReactOS Applications
- * LICENSE:     GPL - See COPYING in the top level directory
+ * LICENSE:     LGPL - See COPYING in the top level directory
  * FILE:        base/applications/toolspage.c
  * PURPOSE:     Tools page message handler
  * COPYRIGHT:   Copyright 2005-2006 Christoph von Wittich <Christoph@ApiViewer.de>