diff -Nurp keepassx-0.4.3/src/dialogs/EditEntryDlg.cpp keepassx-0.4.3/src/dialogs/EditEntryDlg.cpp
--- keepassx-0.4.3/src/dialogs/EditEntryDlg.cpp	2009-08-31 18:44:21.000000000 +0200
+++ keepassx-0.4.3/src/dialogs/EditEntryDlg.cpp	2013-04-03 18:59:47.852000124 +0200
@@ -43,8 +43,6 @@ CEditEntryDlg::CEditEntryDlg(IDatabase*
 	setGeometry( config->dialogGeometry(this) );
 
 	connect(Edit_Title, SIGNAL(textChanged(const QString&)), this, SLOT( OnTitleTextChanged(const QString&)));
-	connect(Edit_Password_w, SIGNAL(editingFinished()), this, SLOT(OnPasswordwLostFocus()));
-	connect(Edit_Password_w, SIGNAL(textChanged(const QString&)), this, SLOT( OnPasswordwTextChanged()));
 	connect(Edit_Password, SIGNAL(textChanged(const QString&)), this, SLOT( OnPasswordTextChanged()));
 	connect(ButtonEchoMode, SIGNAL(clicked()), this, SLOT( ChangeEchoMode()));
 	connect(buttonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), this, SLOT( OnButtonCancel()));
@@ -92,15 +90,12 @@ CEditEntryDlg::CEditEntryDlg(IDatabase*
 	SecString Password=entry->password();
 	Password.unlock();
 	Edit_Password->setText(Password.string());
-	Edit_Password_w->setText(Password.string());
 	Password.lock();
 	if(!config->showPasswords())
 		ChangeEchoMode();
     else
         ButtonEchoMode->setIcon(getIcon("pwd_show"));
 
-    // MX-COMMENT: This call is not needed. Both Passwords fields will always have the same value
-    OnPasswordwLostFocus();
 	int bits=(Password.length()*8);
 	Label_Bits->setText(tr("%1 Bit").arg(QString::number(bits)));
 	if(bits>128)
@@ -173,10 +168,6 @@ void CEditEntryDlg::InitGroupComboBox(){
 void CEditEntryDlg::OnButtonOK()
 {
 	bool EntryMoved=false;
-	if(QString::compare(Edit_Password->text(),Edit_Password_w->text())!=0){
-		QMessageBox::warning(NULL,tr("Warning"),tr("Password and password repetition are not equal.\nPlease check your input."),tr("OK"));
-		return;
-	}
 
 	if(CheckBox_ExpiresNever->checkState()==Qt::Checked){
 		DateTime_Expire->setDateTime(Date_Never);
@@ -240,13 +231,11 @@ void CEditEntryDlg::ChangeEchoMode()
 {
 	if(Edit_Password->echoMode()==QLineEdit::Normal){
 		Edit_Password->setEchoMode(QLineEdit::Password);
-		Edit_Password_w->setEchoMode(QLineEdit::Password);
 		ButtonEchoMode->setIcon(getIcon("pwd_hide"));
 	}
 	else
 	{
 		Edit_Password->setEchoMode(QLineEdit::Normal);
-		Edit_Password_w->setEchoMode(QLineEdit::Normal);
 		ButtonEchoMode->setIcon(getIcon("pwd_show"));
 	}
 }
@@ -258,37 +247,12 @@ void CEditEntryDlg::OnTitleTextChanged(c
 
 void CEditEntryDlg::OnPasswordTextChanged()
 {
-	Edit_Password_w->setText(QString());
 	int bits=(Edit_Password->text().length()*8);
 	Label_Bits->setText(QString::number(bits)+" Bit");
 	if(bits>128)bits=128;
 	Progress_Quali->setValue(100*bits/128);
 }
 
-void CEditEntryDlg::OnPasswordwTextChanged()
-{
-	if(QString::compare(Edit_Password_w->text(),Edit_Password->text().mid(0,(Edit_Password_w->text().length())))!=0){
-		QPalette palette;
-		palette.setColor(Edit_Password_w->backgroundRole(),QColor(255,125,125));
-		Edit_Password_w->setPalette(palette);
-	}
-	else {
-		Edit_Password_w->setPalette(QApplication::palette());
-	}
-}
-
-void CEditEntryDlg::OnPasswordwLostFocus()
-{
-	if (QString::compare(Edit_Password_w->text(),Edit_Password->text())!=0){
-		QPalette palette;
-		palette.setColor(Edit_Password_w->backgroundRole(),QColor(255,125,125));
-		Edit_Password_w->setPalette(palette);
-	}
-	else {
-		Edit_Password_w->setPalette(QApplication::palette ());
-	}
-}
-
 void CEditEntryDlg::OnNewAttachment()
 {
 	QString filename=QFileDialog::getOpenFileName(this,tr("Add Attachment..."),QDir::homePath());
@@ -368,7 +332,6 @@ void CEditEntryDlg::OnButtonGenPw()
 	CGenPwDialog dlg(this,false);
 	if(dlg.exec()){
 		Edit_Password->setText(dlg.Edit_dest->text());
-		Edit_Password_w->setText(dlg.Edit_dest->text());
 		ModFlag=true;
 	}
 }
diff -Nurp keepassx-0.4.3/src/dialogs/EditEntryDlg.h keepassx-0.4.3/src/dialogs/EditEntryDlg.h
--- keepassx-0.4.3/src/dialogs/EditEntryDlg.h	2009-03-18 13:09:20.000000000 +0100
+++ keepassx-0.4.3/src/dialogs/EditEntryDlg.h	2013-04-03 18:57:26.060000166 +0200
@@ -42,8 +42,6 @@ class CEditEntryDlg : public QDialog, pr
 	
 	private slots:
 		void OnTitleTextChanged(const QString&);
-		void OnPasswordwLostFocus();
-		void OnPasswordwTextChanged();
 		void OnPasswordTextChanged();
 		void ChangeEchoMode();
 		void OnButtonCancel();
diff -Nurp keepassx-0.4.3/src/forms/EditEntryDlg.ui keepassx-0.4.3/src/forms/EditEntryDlg.ui
--- keepassx-0.4.3/src/forms/EditEntryDlg.ui	2009-08-25 19:52:11.000000000 +0200
+++ keepassx-0.4.3/src/forms/EditEntryDlg.ui	2013-04-03 18:36:05.503999998 +0200
@@ -54,15 +54,6 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
-      <widget class="QLineEdit" name="Edit_Password_w">
-       <property name="font">
-        <font>
-         <family>Serif</family>
-        </font>
-       </property>
-      </widget>
-     </item>
      <item row="0" column="1">
       <widget class="QToolButton" name="ButtonEchoMode">
        <property name="sizePolicy">
@@ -199,19 +190,6 @@
    <item row="3" column="1">
     <widget class="QLineEdit" name="Edit_UserName"/>
    </item>
-   <item row="6" column="0">
-    <widget class="QLabel" name="textLabel8">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Repeat:</string>
-     </property>
-    </widget>
-   </item>
    <item row="5" column="0">
     <widget class="QLabel" name="textLabel6">
      <property name="sizePolicy">
@@ -513,7 +491,6 @@
   <tabstop>Edit_UserName</tabstop>
   <tabstop>Edit_URL</tabstop>
   <tabstop>Edit_Password</tabstop>
-  <tabstop>Edit_Password_w</tabstop>
   <tabstop>ButtonEchoMode</tabstop>
   <tabstop>ButtonGenPw</tabstop>
   <tabstop>Edit_Comment</tabstop>