--- a/securitysettings/eapqtdialogs/src/eapusernamepwddialog.cpp	Fri Sep 03 09:22:44 2010 +0300
+++ b/securitysettings/eapqtdialogs/src/eapusernamepwddialog.cpp	Thu Sep 16 13:07:04 2010 +0300
@@ -17,7 +17,7 @@
 */
 
 /*
- * %version: 6 %
+ * %version: 7 %
  */
 
 // System includes
@@ -110,7 +110,8 @@
     //by pressing any of the Action buttons
     this->setModal(true);
     this->setTimeout(HbPopup::NoTimeout);
-    this->setDismissPolicy(HbPopup::NoDismiss);    
+    this->setDismissPolicy(HbPopup::NoDismiss);  
+    this->setDismissOnAction(false);       
     this->setAdditionalRowVisible(true);
     
     //Set the first Line Edit (user name) to be on the screen
@@ -158,15 +159,11 @@
     HbAction* actionCancel = new HbAction(hbTrId("txt_common_button_cancel"),this);
     this->addAction( actionCancel );    
     
-    //Disconnect action Ok from the default SLOT and connect to 
-    //a SLOT owned by this class 
-    disconnect(actionOk, SIGNAL(triggered()),this, SLOT(close()));
+    //Connect to a SLOT owned by this class 
     bool connected = connect(actionOk, SIGNAL(triggered()), this, SLOT(okPressed()));
     Q_ASSERT(connected == true);
     
-    //Disconnect action Cancel from the default SLOT and connect to 
-    //a SLOT owned by this class 
-    disconnect(actionCancel, SIGNAL(triggered()),this, SLOT(close()));
+    //Connect to a SLOT owned by this class 
     connected = connect(actionCancel, SIGNAL(triggered()), this, SLOT(cancelPressed()));
     Q_ASSERT(connected == true);