diff --git a/src/core/Database.cpp b/src/core/Database.cpp
index 5297c2ad..22fc0723 100644
--- a/src/core/Database.cpp
+++ b/src/core/Database.cpp
@@ -183,6 +183,7 @@ QByteArray Database::challengeResponseKey() const
 
 bool Database::challengeMasterSeed(const QByteArray& masterSeed)
 {
+    m_data.masterSeed = masterSeed;
     return m_data.key.challenge(masterSeed, m_data.challengeResponseKey);
 }
 
@@ -256,6 +257,22 @@ bool Database::verifyKey(const CompositeKey& key) const
 {
     Q_ASSERT(hasKey());
 
+    /* If the database has challenge response keys, then the the verification
+     * key better as well */
+    if (!m_data.challengeResponseKey.isEmpty()) {
+        QByteArray result;
+
+        if (!key.challenge(m_data.masterSeed, result)) {
+            /* Challenge failed, (YubiKey?) removed? */
+            return false;
+        }
+
+        if (m_data.challengeResponseKey != result) {
+            /* Wrong response from challenged device(s) */
+            return false;
+        }
+    }
+
     return (m_data.key.rawKey() == key.rawKey());
 }
 
diff --git a/src/core/Database.h b/src/core/Database.h
index be022ae3..3f946a1c 100644
--- a/src/core/Database.h
+++ b/src/core/Database.h
@@ -59,6 +59,7 @@ public:
         QByteArray transformedMasterKey;
         CompositeKey key;
         bool hasKey;
+        QByteArray masterSeed;
         QByteArray challengeResponseKey;
     };
 
diff --git a/src/gui/UnlockDatabaseWidget.cpp b/src/gui/UnlockDatabaseWidget.cpp
index a005d0e6..d6beb133 100644
--- a/src/gui/UnlockDatabaseWidget.cpp
+++ b/src/gui/UnlockDatabaseWidget.cpp
@@ -33,6 +33,7 @@ void UnlockDatabaseWidget::clearForms()
     m_ui->comboKeyFile->clear();
     m_ui->checkPassword->setChecked(false);
     m_ui->checkKeyFile->setChecked(false);
+    m_ui->checkChallengeResponse->setChecked(false);
     m_ui->buttonTogglePassword->setChecked(false);
     m_db = nullptr;
 }