diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b0b430d06..78e8a046a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -83,6 +83,7 @@ set(keepassx_SOURCES
     gui/LineEdit.cpp
     gui/MainWindow.cpp
     gui/MessageBox.cpp
+    gui/PasswordEdit.cpp
     gui/PasswordGeneratorWidget.cpp
     gui/SettingsWidget.cpp
     gui/SortFilterHideProxyModel.cpp
@@ -160,6 +161,7 @@ set(keepassx_MOC
     gui/KeePass1OpenWidget.h
     gui/LineEdit.h
     gui/MainWindow.h
+    gui/PasswordEdit.h
     gui/PasswordGeneratorWidget.h
     gui/SettingsWidget.h
     gui/SortFilterHideProxyModel.h
diff --git a/src/gui/PasswordEdit.cpp b/src/gui/PasswordEdit.cpp
new file mode 100644
index 000000000..853269614
--- /dev/null
+++ b/src/gui/PasswordEdit.cpp
@@ -0,0 +1,75 @@
+/*
+ *  Copyright (C) 2014 Felix Geyer <debfx@fobos.de>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "PasswordEdit.h"
+
+#include "core/Global.h"
+
+const QColor PasswordEdit::CorrectSoFarColor = QColor(255, 205, 15);
+const QColor PasswordEdit::ErrorColor = QColor(255, 125, 125);
+
+PasswordEdit::PasswordEdit(QWidget* parent)
+    : QLineEdit(parent)
+    , m_basePasswordEdit(Q_NULLPTR)
+{
+}
+
+void PasswordEdit::enableVerifyMode(PasswordEdit* basePasswordEdit)
+{
+    m_basePasswordEdit = basePasswordEdit;
+
+    updateStylesheet();
+    connect(m_basePasswordEdit, SIGNAL(textChanged(QString)), SLOT(updateStylesheet()));
+    connect(this, SIGNAL(textChanged(QString)), SLOT(updateStylesheet()));
+
+    connect(m_basePasswordEdit, SIGNAL(showPasswordChanged(bool)), SLOT(setShowPassword(bool)));
+}
+
+void PasswordEdit::setShowPassword(bool show)
+{
+    setEchoMode(show ? QLineEdit::Normal : QLineEdit::Password);
+    updateStylesheet();
+    Q_EMIT showPasswordChanged(show);
+}
+
+bool PasswordEdit::passwordsEqual() const
+{
+    return text() == m_basePasswordEdit->text();
+}
+
+void PasswordEdit::updateStylesheet()
+{
+    QString stylesheet("QLineEdit { ");
+
+    if (echoMode() == QLineEdit::Normal) {
+        stylesheet.append("font-family: monospace; ");
+    }
+
+    if (m_basePasswordEdit && !passwordsEqual()) {
+        stylesheet.append("background: %1; ");
+
+        if (m_basePasswordEdit->text().startsWith(text())) {
+            stylesheet = stylesheet.arg(CorrectSoFarColor.name());
+        }
+        else {
+            stylesheet = stylesheet.arg(ErrorColor.name());
+        }
+    }
+
+    stylesheet.append("}");
+    setStyleSheet(stylesheet);
+}
diff --git a/src/gui/PasswordEdit.h b/src/gui/PasswordEdit.h
new file mode 100644
index 000000000..cfb4a764f
--- /dev/null
+++ b/src/gui/PasswordEdit.h
@@ -0,0 +1,51 @@
+/*
+ *  Copyright (C) 2014 Felix Geyer <debfx@fobos.de>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef KEEPASSX_PASSWORDEDIT_H
+#define KEEPASSX_PASSWORDEDIT_H
+
+#include <QLineEdit>
+
+#include "core/Global.h"
+
+class PasswordEdit : public QLineEdit
+{
+    Q_OBJECT
+
+public:
+    static const QColor CorrectSoFarColor;
+    static const QColor ErrorColor;
+
+    explicit PasswordEdit(QWidget* parent = Q_NULLPTR);
+    void enableVerifyMode(PasswordEdit* baseEdit);
+
+public Q_SLOTS:
+    void setShowPassword(bool show);
+
+Q_SIGNALS:
+    void showPasswordChanged(bool show);
+
+private Q_SLOTS:
+    void updateStylesheet();
+
+private:
+    bool passwordsEqual() const;
+
+    PasswordEdit* m_basePasswordEdit;
+};
+
+#endif // KEEPASSX_PASSWORDEDIT_H