diff --git a/KeyEdit.cpp b/KeyEdit.cpp
index 22f24fb..b89097a 100644
--- a/KeyEdit.cpp
+++ b/KeyEdit.cpp
@@ -21,7 +21,7 @@ KeyEdit::KeyEdit(K7Main * owner)
 {
     m_owner = owner;
     m_popupUid = NULL;
-    m_targetKeyFpr = WString::Empty;
+    m_targetUidValidityKeyFpr = WString::Empty;
 }
 
 KeyEdit::~KeyEdit()
@@ -130,7 +130,7 @@ bool KeyEdit::IsOurKey(const WString& fpr)
 
 void KeyEdit::OnUidValidityClicked(WTreeTableNode* uidNode, vector<WString>& privateKeys, const WString& targetKeyFpr)
 {
-    if (targetKeyFpr != m_targetKeyFpr) {
+    if (targetKeyFpr != m_targetUidValidityKeyFpr) {
         bool passwordVisibility = true;
         if (m_popupUid)
             passwordVisibility = m_popupUid->IsPasswordVisible();
@@ -139,7 +139,7 @@ void KeyEdit::OnUidValidityClicked(WTreeTableNode* uidNode, vector<WString>& pri
         m_popupUid = new PopupCertifyUserId(lblUidValidity, m_owner->m_tmwMessage);
         m_popupUid->Create(privateKeys, targetKeyFpr);
         m_popupUid->ShowPassphrase(passwordVisibility);
-        m_targetKeyFpr = targetKeyFpr;
+        m_targetUidValidityKeyFpr = targetKeyFpr;
         m_popupUid->GetCertifyButton()->clicked().connect(this, &KeyEdit::CertifyKey);
     }
     m_popupUid->show();
diff --git a/KeyEdit.h b/KeyEdit.h
index e1a9677..c187697 100644
--- a/KeyEdit.h
+++ b/KeyEdit.h
@@ -57,7 +57,7 @@ public:
 private:
     K7Main * m_owner;
     PopupCertifyUserId * m_popupUid;
-    WString m_targetKeyFpr;
+    WString m_targetUidValidityKeyFpr;
     /**
      * Unknown is common.
      * \n If keyHasSecret is true, show only Ultimate level.