diff --git a/retroshare-gui/src/gui/QuickStartWizard.cpp b/retroshare-gui/src/gui/QuickStartWizard.cpp
index 0ea08ac6f..2df96f98b 100644
--- a/retroshare-gui/src/gui/QuickStartWizard.cpp
+++ b/retroshare-gui/src/gui/QuickStartWizard.cpp
@@ -169,6 +169,8 @@ void QuickStartWizard::on_pushButtonSystemFinish_clicked()
   
   _settings->setRunRetroshareOnBoot(ui.checkBoxRunRetroshareAtSystemStartup->isChecked());
   
+  _settings->setValue(QString::fromUtf8("FirstRun"), firstRunWizard());
+  
   saveChanges();
   
 	close();
@@ -355,7 +357,7 @@ QuickStartWizard::loadGeneral()
 
   ui.checkBoxQuit->setChecked(_settings->value(QString::fromUtf8("doQuit"), false).toBool());
   
-
+	ui.checkBoxQuickWizard->setChecked(_settings->value(QString::fromUtf8("FirstRun"), false).toBool());
 }
 
 bool QuickStartWizard::quitbox() const {
@@ -368,6 +370,11 @@ bool QuickStartWizard::startMinimized() const {
   return ui.checkBoxStartMinimized->isChecked();
 }
 
+bool QuickStartWizard::firstRunWizard() const {
+  if(ui.checkBoxQuickWizard->isChecked()) return true;
+  return ui.checkBoxQuickWizard->isChecked();
+}
+
 /** Loads the settings for this page */
 void QuickStartWizard::loadNetwork()
 {
diff --git a/retroshare-gui/src/gui/QuickStartWizard.h b/retroshare-gui/src/gui/QuickStartWizard.h
index ca1b5677b..88996d7f7 100644
--- a/retroshare-gui/src/gui/QuickStartWizard.h
+++ b/retroshare-gui/src/gui/QuickStartWizard.h
@@ -43,6 +43,7 @@ public:
     
       bool startMinimized() const;
       bool quitbox() const;
+      bool firstRunWizard() const;
 
 
 
diff --git a/retroshare-gui/src/gui/QuickStartWizard.ui b/retroshare-gui/src/gui/QuickStartWizard.ui
index 84e32dd7c..1d4a1ebd7 100644
--- a/retroshare-gui/src/gui/QuickStartWizard.ui
+++ b/retroshare-gui/src/gui/QuickStartWizard.ui
@@ -121,7 +121,7 @@ p, li { white-space: pre-wrap; }
    <item row="1" column="0">
     <widget class="QStackedWidget" name="pagesWizard">
      <property name="currentIndex">
-      <number>0</number>
+      <number>5</number>
      </property>
      <widget class="QWidget" name="pageWelcome">
       <layout class="QGridLayout" name="gridLayout_2">
@@ -1224,6 +1224,13 @@ p, li { white-space: pre-wrap; }
               </property>
              </widget>
             </item>
+            <item row="3" column="0">
+             <widget class="QCheckBox" name="checkBoxQuickWizard">
+              <property name="text">
+               <string>Do not Start Quick Start Wizard on Start</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </item>
           <item row="10" column="0">