diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp
index 3739d245..b0e08b24 100644
--- a/oscar/mainwindow.cpp
+++ b/oscar/mainwindow.cpp
@@ -999,7 +999,7 @@ void MainWindow::on_action_Import_Data_triggered()
 }
 
 
-QList<ImportPath> MainWindow::selectCPAPDataCards(const QString & prompt)
+QList<ImportPath> MainWindow::selectCPAPDataCards(const QString & prompt, bool alwaysPrompt)
 {
     QList<ImportPath> datacards = detectCPAPCards();
 
@@ -1028,7 +1028,7 @@ QList<ImportPath> MainWindow::selectCPAPDataCards(const QString & prompt)
             infostr = tr("A %1 file structure was located at:").arg(datacards[0].loader->loaderName());
         }
 
-        if (!p_profile->cpap->autoImport()) {
+        if (alwaysPrompt || !p_profile->cpap->autoImport()) {
             QMessageBox mbox(QMessageBox::NoIcon,
                 tr("CPAP Data Located"), infostr+"\n\n"+QDir::toNativeSeparators(datacards[0].path)+"\n\n"+
                 prompt,
@@ -2661,7 +2661,7 @@ void MainWindow::on_mainsplitter_splitterMoved(int, int)
 
 void MainWindow::on_actionCreate_Card_zip_triggered()
 {
-    QList<ImportPath> datacards = selectCPAPDataCards(tr("Would you like to zip this card?"));
+    QList<ImportPath> datacards = selectCPAPDataCards(tr("Would you like to zip this card?"), true);
 
     for (auto & datacard : datacards) {
         QString cardPath = QDir(datacard.path).canonicalPath();
diff --git a/oscar/mainwindow.h b/oscar/mainwindow.h
index ee48c7ec..e50d21c1 100644
--- a/oscar/mainwindow.h
+++ b/oscar/mainwindow.h
@@ -374,7 +374,7 @@ private:
     QString getMainWindowTitle();
     void importCPAPBackups();
     QList<ImportPath> detectCPAPCards();
-    QList<ImportPath> selectCPAPDataCards(const QString & prompt);
+    QList<ImportPath> selectCPAPDataCards(const QString & prompt, bool alwaysPrompt = false);
     void importCPAPDataCards(const QList<ImportPath> & datacards);
     void addMachineToMenu(Machine* mach, QMenu* menu);
     void purgeDay(MachineType type);