diff --git a/src/llconserverdlg.cpp b/src/llconserverdlg.cpp
index 93b973a0..fe7b4cbe 100755
--- a/src/llconserverdlg.cpp
+++ b/src/llconserverdlg.cpp
@@ -37,6 +37,17 @@ CLlconServerDlg::CLlconServerDlg ( CServer*        pNServP,
     setupUi ( this );
 
 
+
+// TEST
+#ifdef _WIN32
+/*
+QSettings RegSettings ( "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run",
+                        QSettings::NativeFormat );
+RegSettings.setValue ( "llcon server", QCoreApplication::applicationFilePath() );
+*/
+#endif
+
+
     // Add help text to controls -----------------------------------------------
     // client list
     ListViewClients->setWhatsThis ( tr ( "<b>Client List:</b> The client list "
@@ -210,10 +221,10 @@ ListViewClients->setMinimumHeight ( 140 );
     UpdateGUIDependencies();
 
 
-    // View menu  --------------------------------------------------------------
-    QMenu* pViewMenu = new QMenu ( "&Window", this );
-
-    pViewMenu->addAction ( tr ( "E&xit" ), this,
+    // View menu  --------------------------------------------------------------
+    QMenu* pViewMenu = new QMenu ( "&Window", this );
+
+    pViewMenu->addAction ( tr ( "E&xit" ), this,
         SLOT ( close() ), QKeySequence ( Qt::CTRL + Qt::Key_Q ) );
 
 
diff --git a/src/llconserverdlg.h b/src/llconserverdlg.h
index c9b6a1d5..e2e84345 100755
--- a/src/llconserverdlg.h
+++ b/src/llconserverdlg.h
@@ -31,6 +31,7 @@
 #include <qmenubar.h>
 #include <qlayout.h>
 #include <qsystemtrayicon.h>
+#include <qsettings.h>
 #include "global.h"
 #include "server.h"
 #include "multicolorled.h"
diff --git a/windows/installer.nsi b/windows/installer.nsi
index bbb8d886..4064a098 100755
--- a/windows/installer.nsi
+++ b/windows/installer.nsi
@@ -1,13 +1,14 @@
 ; llcon NSIS installer script
 
-!define APP_NAME       "Llcon"
-!define APP_EXE        "llcon.exe"
-!define UNINSTALL_EXE  "Uninstall.exe"
-!define INSTALLER_NAME "llconinstaller.exe"
-!define VS_REDIST_PATH "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\"
-;!define VS_REDIST_PATH "C:\Programme\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\"
-!define VS_REDIST_EXE  "vcredist_x86.exe"
-!define UNINST_KEY     "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}"
+!define APP_NAME          "Llcon"
+!define REG_AUTO_RUN_NAME "llcon server"
+!define APP_EXE			  "llcon.exe"
+!define UNINSTALL_EXE     "Uninstall.exe"
+!define INSTALLER_NAME    "llconinstaller.exe"
+!define VS_REDIST_PATH    "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\"
+;!define VS_REDIST_PATH   "C:\Programme\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\"
+!define VS_REDIST_EXE     "vcredist_x86.exe"
+!define UNINST_KEY        "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}"
 
 
 SetCompressor lzma
@@ -73,6 +74,9 @@ Section "Uninstall"
 
 DeleteRegKey HKLM "${UNINST_KEY}"
 
+; the software may have written an auto run entry in the registry, remove it
+DeleteRegKey HKEY_CURRENT_USER "Software\Microsoft\Windows\CurrentVersion\Run\${REG_AUTO_RUN_NAME}"
+
 Delete "$DESKTOP\${APP_NAME}.lnk"
 Delete "$SMPROGRAMS\${APP_NAME}\${APP_NAME}.lnk"
 Delete "$SMPROGRAMS\${APP_NAME}\${APP_NAME} server.lnk"