diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 8c2e73c7b..d07d11d76 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -112,6 +112,13 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
 
     /* Create RshareSettings object */
     _settings = new RshareSettings();
+    
+    if (!_settings->value(QString::fromUtf8("FirstRun"), false).toBool())
+    {
+    _settings->setValue(QString::fromUtf8("FirstRun"), false);
+		QuickStartWizard *qstartWizard = new QuickStartWizard(this);
+		qstartWizard->exec();
+    }
 
     setWindowTitle(tr("RetroShare %1 a secure decentralised commmunication platform").arg(retroshareVersion()));
 
diff --git a/retroshare-gui/src/gui/settings/GeneralPage.cpp b/retroshare-gui/src/gui/settings/GeneralPage.cpp
index 1e0107574..dbc8a9d48 100755
--- a/retroshare-gui/src/gui/settings/GeneralPage.cpp
+++ b/retroshare-gui/src/gui/settings/GeneralPage.cpp
@@ -59,6 +59,8 @@ GeneralPage::save(QString &errmsg)
   _settings->setValue(QString::fromUtf8("doQuit"), quit());
   
   _settings->setValue(QString::fromUtf8("ClosetoTray"), closetoTray());
+  
+  _settings->setValue(QString::fromUtf8("FirstRun"), firstRun());
 
   _settings->setRunRetroshareOnBoot(
   ui.chkRunRetroshareAtSystemStartup->isChecked());
@@ -79,6 +81,9 @@ GeneralPage::load()
   
   ui.checkClosetoTray->setChecked(_settings->value(QString::fromUtf8("ClosetoTray"), false).toBool());
 
+	ui.checkBoxWizard->setChecked(_settings->value(QString::fromUtf8("FirstRun"), false).toBool());
+
+
 }
 
 bool GeneralPage::quit() const {
@@ -96,6 +101,11 @@ bool GeneralPage::closetoTray() const {
   return ui.checkClosetoTray->isChecked();
 }
 
+bool GeneralPage::firstRun() const {
+  if(ui.checkBoxWizard->isChecked()) return true;
+  return ui.checkBoxWizard->isChecked();
+}
+
 /** Called when the "show on startup" checkbox is toggled. */
 void
 GeneralPage::toggleShowOnStartup(bool checked)
diff --git a/retroshare-gui/src/gui/settings/GeneralPage.h b/retroshare-gui/src/gui/settings/GeneralPage.h
index 7cc6868a1..7aebd9b65 100755
--- a/retroshare-gui/src/gui/settings/GeneralPage.h
+++ b/retroshare-gui/src/gui/settings/GeneralPage.h
@@ -50,6 +50,7 @@ public:
   bool startMinimized() const;
   bool closetoTray() const;
   bool quit() const;
+  bool firstRun() const;
 
 
 private slots:
diff --git a/retroshare-gui/src/gui/settings/GeneralPage.ui b/retroshare-gui/src/gui/settings/GeneralPage.ui
index 9471fef11..1f812a152 100755
--- a/retroshare-gui/src/gui/settings/GeneralPage.ui
+++ b/retroshare-gui/src/gui/settings/GeneralPage.ui
@@ -538,14 +538,14 @@
       <string>Misc</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
+      <item row="1" column="0">
        <widget class="QCheckBox" name="checkQuit">
         <property name="text">
          <string>Do not show the Quit RetroShare MessageBox</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
+      <item row="2" column="0">
        <widget class="QCheckBox" name="checkClosetoTray">
         <property name="text">
          <string>Do not Minimize to Tray Icon</string>
@@ -555,6 +555,13 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="checkBoxWizard">
+        <property name="text">
+         <string>Do not run Quick Start Wizard on RetroShare start</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>