--- a/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/NotifSrc/EasyWepDlgNotif.cpp	Tue Aug 31 15:35:44 2010 +0300
+++ b/connectionutilities/ConnectionDialogs/ConnectionUiUtilities/NotifSrc/EasyWepDlgNotif.cpp	Wed Sep 01 12:23:51 2010 +0100
@@ -21,7 +21,7 @@
 #include "WepWpaQueryDlg.h"
 #include "ConnUiUtilsNotif.h"
 
-#include <connuiutilsnotif.rsg>
+#include <ConnUiUtilsNotif.rsg>
 #include <StringLoader.h>
 #include <featmgr.h>
 
@@ -49,6 +49,13 @@
                                     TInt aReplySlot,
                                     const RMessagePtr2& aMessage )
     {
+    if ( ScreenSaverOn() || AutolockOn() )
+        {
+        // Screen saver or Autolock is active. Cancel the dialog.
+        aMessage.Complete( KErrCancel );
+        return;
+        }
+    
     iReplySlot = aReplySlot;
     iMessage = aMessage;
     iCancelled = EFalse;