diff --git a/share/translations/keepassxc_en.ts b/share/translations/keepassxc_en.ts
index 13ed25a20..41787c6e5 100644
--- a/share/translations/keepassxc_en.ts
+++ b/share/translations/keepassxc_en.ts
@@ -560,10 +560,6 @@
         <source>Lock databases after minimizing the window</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Require password repeat when it is visible</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Hide passwords when editing them</source>
         <translation type="unfinished"></translation>
diff --git a/src/core/Config.cpp b/src/core/Config.cpp
index fa5e1443e..24b122be4 100644
--- a/src/core/Config.cpp
+++ b/src/core/Config.cpp
@@ -137,7 +137,6 @@ static const QHash<Config::ConfigKey, ConfigDirective> configStrings = {
     {Config::Security_LockDatabaseMinimize, {QS("Security/LockDatabaseMinimize"), Roaming, false}},
     {Config::Security_LockDatabaseScreenLock, {QS("Security/LockDatabaseScreenLock"), Roaming, true}},
     {Config::Security_RelockAutoType, {QS("Security/RelockAutoType"), Roaming, false}},
-    {Config::Security_PasswordsRepeatVisible, {QS("Security/PasswordsRepeatVisible"), Roaming, true}},
     {Config::Security_PasswordsHidden, {QS("Security/PasswordsHidden"), Roaming, true}},
     {Config::Security_PasswordEmptyPlaceholder, {QS("Security/PasswordEmptyPlaceholder"), Roaming, false}},
     {Config::Security_HidePasswordPreviewPanel, {QS("Security/HidePasswordPreviewPanel"), Roaming, true}},
@@ -332,7 +331,7 @@ static const QHash<QString, Config::ConfigKey> deprecationMap = {
     {QS("security/passwordscleartext"), Config::Security_PasswordsHidden},
     {QS("security/passwordemptynodots"), Config::Security_PasswordEmptyPlaceholder},
     {QS("security/HidePasswordPreviewPanel"), Config::Security_HidePasswordPreviewPanel},
-    {QS("security/passwordsrepeat"), Config::Security_PasswordsRepeatVisible},
+    {QS("security/passwordsrepeat"), Config::Deleted},
     {QS("security/hidenotes"), Config::Security_HideNotes},
     {QS("KeeShare/Settings.own"), Config::KeeShare_Own},
     {QS("KeeShare/Settings.foreign"), Config::KeeShare_Foreign},
@@ -378,7 +377,8 @@ static const QHash<QString, Config::ConfigKey> deprecationMap = {
     {QS("Security/ResetTouchIdScreenlock"), Config::Deleted},
 
     // 2.8.0
-    {QS("GUI/AdvancedSettings"), Config::Deleted}};
+    {QS("GUI/AdvancedSettings"), Config::Deleted},
+    {QS("Security/PasswordsRepeatVisible"), Config::Deleted}};
 
 /**
  * Migrate settings from previous versions.
diff --git a/src/core/Config.h b/src/core/Config.h
index b7a202574..8ca18fe29 100644
--- a/src/core/Config.h
+++ b/src/core/Config.h
@@ -118,7 +118,6 @@ public:
         Security_LockDatabaseMinimize,
         Security_LockDatabaseScreenLock,
         Security_RelockAutoType,
-        Security_PasswordsRepeatVisible,
         Security_PasswordsHidden,
         Security_PasswordEmptyPlaceholder,
         Security_HidePasswordPreviewPanel,
diff --git a/src/gui/ApplicationSettingsWidget.cpp b/src/gui/ApplicationSettingsWidget.cpp
index 1f1632e11..81be47ff6 100644
--- a/src/gui/ApplicationSettingsWidget.cpp
+++ b/src/gui/ApplicationSettingsWidget.cpp
@@ -318,8 +318,6 @@ void ApplicationSettingsWidget::loadSettings()
     m_secUi->passwordPreviewCleartextCheckBox->setChecked(
         config()->get(Config::Security_HidePasswordPreviewPanel).toBool());
     m_secUi->hideTotpCheckBox->setChecked(config()->get(Config::Security_HideTotpPreviewPanel).toBool());
-    m_secUi->passwordsRepeatVisibleCheckBox->setChecked(
-        config()->get(Config::Security_PasswordsRepeatVisible).toBool());
     m_secUi->hideNotesCheckBox->setChecked(config()->get(Config::Security_HideNotes).toBool());
     m_secUi->NoConfirmMoveEntryToRecycleBinCheckBox->setChecked(
         config()->get(Config::Security_NoConfirmMoveEntryToRecycleBin).toBool());
@@ -433,7 +431,6 @@ void ApplicationSettingsWidget::saveSettings()
 
     config()->set(Config::Security_HidePasswordPreviewPanel, m_secUi->passwordPreviewCleartextCheckBox->isChecked());
     config()->set(Config::Security_HideTotpPreviewPanel, m_secUi->hideTotpCheckBox->isChecked());
-    config()->set(Config::Security_PasswordsRepeatVisible, m_secUi->passwordsRepeatVisibleCheckBox->isChecked());
     config()->set(Config::Security_HideNotes, m_secUi->hideNotesCheckBox->isChecked());
     config()->set(Config::Security_NoConfirmMoveEntryToRecycleBin,
                   m_secUi->NoConfirmMoveEntryToRecycleBinCheckBox->isChecked());
diff --git a/src/gui/ApplicationSettingsWidgetSecurity.ui b/src/gui/ApplicationSettingsWidgetSecurity.ui
index 6dc122b80..152f659ff 100644
--- a/src/gui/ApplicationSettingsWidgetSecurity.ui
+++ b/src/gui/ApplicationSettingsWidgetSecurity.ui
@@ -186,13 +186,6 @@
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QCheckBox" name="passwordsRepeatVisibleCheckBox">
-        <property name="text">
-         <string>Require password repeat when it is visible</string>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="QCheckBox" name="passwordsHiddenCheckBox">
         <property name="text">
@@ -288,7 +281,6 @@
   <tabstop>clearSearchSpinBox</tabstop>
   <tabstop>lockDatabaseOnScreenLockCheckBox</tabstop>
   <tabstop>lockDatabaseMinimizeCheckBox</tabstop>
-  <tabstop>passwordsRepeatVisibleCheckBox</tabstop>
   <tabstop>passwordsHiddenCheckBox</tabstop>
   <tabstop>passwordShowDotsCheckBox</tabstop>
   <tabstop>passwordPreviewCleartextCheckBox</tabstop>
diff --git a/src/gui/PasswordWidget.cpp b/src/gui/PasswordWidget.cpp
index e1fc20c6b..2b2d9057b 100644
--- a/src/gui/PasswordWidget.cpp
+++ b/src/gui/PasswordWidget.cpp
@@ -148,8 +148,6 @@ void PasswordWidget::setRepeatPartner(PasswordWidget* repeatPartner)
     m_repeatPasswordWidget = repeatPartner;
     m_repeatPasswordWidget->setParentPasswordEdit(this);
 
-    connect(
-        m_ui->passwordEdit, SIGNAL(textChanged(QString)), m_repeatPasswordWidget, SLOT(autocompletePassword(QString)));
     connect(m_ui->passwordEdit, SIGNAL(textChanged(QString)), m_repeatPasswordWidget, SLOT(updateRepeatStatus()));
 }
 
@@ -178,12 +176,6 @@ void PasswordWidget::setShowPassword(bool show)
 
     if (m_repeatPasswordWidget) {
         m_repeatPasswordWidget->setEchoMode(show ? QLineEdit::Normal : QLineEdit::Password);
-        if (!config()->get(Config::Security_PasswordsRepeatVisible).toBool()) {
-            m_repeatPasswordWidget->setEnabled(!show);
-            m_repeatPasswordWidget->setText(text());
-        } else {
-            m_repeatPasswordWidget->setEnabled(true);
-        }
     }
 }
 
@@ -231,14 +223,6 @@ void PasswordWidget::updateRepeatStatus()
     }
 }
 
-void PasswordWidget::autocompletePassword(const QString& password)
-{
-    if (!config()->get(Config::Security_PasswordsRepeatVisible).toBool()
-        && m_ui->passwordEdit->echoMode() == QLineEdit::Normal) {
-        setText(password);
-    }
-}
-
 bool PasswordWidget::event(QEvent* event)
 {
     if (isVisible()
diff --git a/src/gui/PasswordWidget.h b/src/gui/PasswordWidget.h
index d803b1f81..5ad1c4f5c 100644
--- a/src/gui/PasswordWidget.h
+++ b/src/gui/PasswordWidget.h
@@ -61,7 +61,6 @@ protected:
     bool event(QEvent* event) override;
 
 private slots:
-    void autocompletePassword(const QString& password);
     void popupPasswordGenerator();
     void updateRepeatStatus();
     void updatePasswordStrength(const QString& password);
diff --git a/tests/TestConfig.cpp b/tests/TestConfig.cpp
index 1177ac585..b83a905d0 100644
--- a/tests/TestConfig.cpp
+++ b/tests/TestConfig.cpp
@@ -35,7 +35,6 @@ void TestConfig::testUpgrade()
     Config::createConfigFromFile(tempFile.fileName());
 
     // value of new setting should be opposite the value of deprecated setting
-    QVERIFY(!config()->get(Config::Security_PasswordsRepeatVisible).toBool());
     QVERIFY(!config()->get(Config::Security_PasswordsHidden).toBool());
     QVERIFY(config()->get(Config::Security_PasswordEmptyPlaceholder).toBool());