diff --git a/mainwindow.cpp b/mainwindow.cpp
index 91010e8f..817ebb5c 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1174,10 +1174,8 @@ void MainWindow::on_action_Rebuild_Oximetry_Index_triggered()
     getOverview()->ReloadGraphs();
 }
 
-void MainWindow::on_actionChange_User_triggered()
+void MainWindow::RestartApplication(bool force_login)
 {
-    PROFILE.Save();
-    PREF.Save();
     QString apppath;
 #ifdef Q_OS_MAC
         // In Mac OS the full path of aplication binary is:
@@ -1188,6 +1186,7 @@ void MainWindow::on_actionChange_User_triggered()
 
         QStringList args;
         args << "-n" << apppath << "-p"; // -n option is important, as it opens a new process
+        if (force_login) args << "-l";
         // -p starts with 1 second delay, to give this process time to save..
 
         if (QProcess::startDetached("/usr/bin/open",args)) {
@@ -1205,11 +1204,18 @@ void MainWindow::on_actionChange_User_triggered()
         //} else
         QStringList args;
         args << "-p";
+        if (force_login) args << "-l";
         if (QProcess::startDetached(apppath,args)) {
             QApplication::instance()->exit();
         } else QMessageBox::warning(this,"Gah!","If you can read this, the restart command didn't work. Your going to have to do it yourself manually.",QMessageBox::Ok);
 #endif
+}
 
+void MainWindow::on_actionChange_User_triggered()
+{
+    PROFILE.Save();
+    PREF.Save();
+    RestartApplication(true);
 }
 
 void MainWindow::on_actionPurge_Current_Day_triggered()
@@ -1245,3 +1251,21 @@ void MainWindow::on_actionPurge_Current_Day_triggered()
     }
     getDaily()->ReloadGraphs();
 }
+
+void MainWindow::on_actionAll_Data_for_current_CPAP_machine_triggered()
+{
+    QDate date=getDaily()->getDate();
+    Day *day=PROFILE.GetDay(date,MT_CPAP);
+    Machine *m;
+    if (day) {
+        m=day->machine;
+        if (!m) {
+            qDebug() << "Gah!! no machine to purge";
+            return;
+        }
+        if (QMessageBox::question(this,"Are you sure?","Are you sure you want to purge all CPAP data for the following machine:\n"+m->properties["Brand"]+" "+m->properties["Model"]+" "+m->properties["ModelNumber"]+" ("+m->properties["Serial"]+")",QMessageBox::Yes,QMessageBox::No)==QMessageBox::Yes) {
+            m->Purge(3478216);
+            RestartApplication();
+        }
+    }
+}
diff --git a/mainwindow.h b/mainwindow.h
index 9daa195a..48dccfb2 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -48,6 +48,7 @@ public:
     Daily *getDaily() { return daily; }
     Overview *getOverview() { return overview; }
     Oximetry *getOximetry() { return oximetry; }
+    void RestartApplication(bool force_login=false);
 
     void selectOximetryTab();
 
@@ -120,6 +121,8 @@ private slots:
 
     void on_actionPurge_Current_Day_triggered();
 
+    void on_actionAll_Data_for_current_CPAP_machine_triggered();
+
 private:
 
     Ui::MainWindow *ui;
diff --git a/mainwindow.ui b/mainwindow.ui
index e136e388..ac5c367a 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -624,6 +624,8 @@
        <string>&amp;Purge CPAP Data</string>
       </property>
       <addaction name="actionPurge_Current_Day"/>
+      <addaction name="separator"/>
+      <addaction name="actionAll_Data_for_current_CPAP_machine"/>
      </widget>
      <addaction name="menu_Purge_CPAP_Data"/>
     </widget>
@@ -799,6 +801,11 @@
     <string>&amp;Current Selected Day</string>
    </property>
   </action>
+  <action name="actionAll_Data_for_current_CPAP_machine">
+   <property name="text">
+    <string>All data for current CPAP machine</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp
index 7cfca6ad..09533be1 100644
--- a/preferencesdialog.cpp
+++ b/preferencesdialog.cpp
@@ -453,37 +453,7 @@ void PreferencesDialog::Save()
 
     if (needs_restart) {
         if (QMessageBox::question(this,"Restart Required","One or more of the changes you have made will require this application to be restarted, in order for these changes to come into effect.\nWould you like do this now?",QMessageBox::Yes,QMessageBox::No)==QMessageBox::Yes) {
-            QString apppath;
-    #ifdef Q_OS_MAC
-            // In Mac OS the full path of aplication binary is:
-            //    <base-path>/myApp.app/Contents/MacOS/myApp
-
-            // prune the extra bits to just get the app bundle path
-            apppath=QApplication::instance()->applicationDirPath().section("/",0,-3);
-
-            QStringList args;
-            args << "-n" << apppath; // -n option is important, as it opens a new process
-            args << "-p";
-
-            if (QProcess::startDetached("/usr/bin/open",args)) {
-                QApplication::instance()->exit();
-            } else QMessageBox::warning(this,"Gah!","If you can read this, the restart command didn't work. Your going to have to do it yourself manually.",QMessageBox::Ok);
-
-    #else
-            apppath=QApplication::instance()->applicationFilePath();
-
-            // If this doesn't work on windoze, try uncommenting this method
-            // Technically should be the same thing..
-
-            //if (QDesktopServices::openUrl(apppath)) {
-            //    QApplication::instance()->exit();
-            //} else
-            QStringList args;
-            args << "-p";
-            if (QProcess::startDetached(apppath,args)) {
-                QApplication::instance()->exit();
-            } else QMessageBox::warning(this,"Gah!","If you can read this, the restart command didn't work. Your going to have to do it yourself manually.",QMessageBox::Ok);
-    #endif
+            mainwin->RestartApplication();
         }
     }
 }