diff --git a/src/gui/reports/ReportsWidgetHibp.cpp b/src/gui/reports/ReportsWidgetHibp.cpp
index 630d5813b1..56899c5890 100644
--- a/src/gui/reports/ReportsWidgetHibp.cpp
+++ b/src/gui/reports/ReportsWidgetHibp.cpp
@@ -125,6 +125,12 @@ void ReportsWidgetHibp::makeHibpTable() {
         row[0]->setForeground(QBrush(QColor("red")));
     }
 
+    // If we're done and everything is good, display a motivational message
+    if (m_pwQueue.isEmpty() && m_pwPwned.isEmpty() && m_error.isEmpty()) {
+        m_referencesModel->clear();
+        m_referencesModel->setHorizontalHeaderLabels(QStringList() << tr("Congratulations, no exposed passwords!"));
+    }
+
     m_ui->hibpTableView->resizeRowsToContents();
 }
 
@@ -173,6 +179,7 @@ void ReportsWidgetHibp::checkNext()
     if (m_pwQueue.empty()) {
         m_downloader.reset();
         m_ui->progressBar->hide();
+        makeHibpTable();
         return;
     }