diff --git a/accountdialog.cpp b/accountdialog.cpp
index c024ea32a..33d1630ed 100644
--- a/accountdialog.cpp
+++ b/accountdialog.cpp
@@ -324,6 +324,8 @@ void AccountDialog::makeImapAccountPage( bool connected )
   connect( mImap.ui.useDefaultIdentityCheck, SIGNAL( toggled(bool) ), this, SLOT( slotIdentityCheckboxChanged() ) );
   connect( mImap.ui.checkCapabilities, SIGNAL(clicked()), SLOT(slotCheckImapCapabilities()));
   connect( mImap.encryptionButtonGroup, SIGNAL(buttonClicked(int)), SLOT(slotImapEncryptionChanged(int)) );
+  connect( mImap.ui.passwordEdit, SIGNAL( textEdited( const QString& ) ),
+           this, SLOT( slotImapPasswordChanged( const QString& ) ) );
 
   // TODO (marc/bo): Test this
   mSieveConfigEditor = new SieveConfigEditor( mImap.ui.tabWidget );
@@ -694,7 +696,7 @@ void AccountDialog::slotPopEncryptionChanged( int id )
     checkHighest( mPop.authButtonGroup );
 }
 
-void AccountDialog::slotPopPasswordChanged(const QString& text)
+void AccountDialog::slotPopPasswordChanged( const QString& text )
 {
   if ( text.isEmpty() )
     mPop.ui.storePasswordCheck->setCheckState( Qt::Unchecked );
@@ -702,6 +704,14 @@ void AccountDialog::slotPopPasswordChanged(const QString& text)
     mPop.ui.storePasswordCheck->setCheckState( Qt::Checked );
 }
 
+void AccountDialog::slotImapPasswordChanged( const QString& text )
+{
+  if ( text.isEmpty() )
+    mImap.ui.storePasswordCheck->setCheckState( Qt::Unchecked );
+  else
+    mImap.ui.storePasswordCheck->setCheckState( Qt::Checked );
+}
+
 void AccountDialog::slotImapEncryptionChanged( int id )
 {
   kDebug() << id;
diff --git a/accountdialog.h b/accountdialog.h
index cfa947b7f..af853a9da 100644
--- a/accountdialog.h
+++ b/accountdialog.h
@@ -113,7 +113,8 @@ class AccountDialog : public KDialog
     void slotFilterOnServerClicked();
     void slotPipeliningClicked();
     void slotPopEncryptionChanged(int);
-    void slotPopPasswordChanged(const QString& text);
+    void slotPopPasswordChanged( const QString& text );
+    void slotImapPasswordChanged( const QString& text );
     void slotImapEncryptionChanged(int);
     void slotCheckPopCapabilities();
     void slotCheckImapCapabilities();