diff -r 6e226572c5f0 -r ece4bbb094df securitydialogs/SecUi/Src/SecUiSecurityHandler.cpp
--- a/securitydialogs/SecUi/Src/SecUiSecurityHandler.cpp	Fri Mar 12 15:46:51 2010 +0200
+++ b/securitydialogs/SecUi/Src/SecUiSecurityHandler.cpp	Mon Mar 15 12:43:21 2010 +0200
@@ -223,7 +223,7 @@
     RDebug::Printf( "%s %s (%u) currentLockStatus=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, currentLockStatus );
     #endif
     delete repository;
-    if(res==0 && currentLockStatus==1)
+    if(res==0 && currentLockStatus>=1 )
         {
         // code is the default one; no need to request it.
         return ETrue;
@@ -1248,7 +1248,7 @@
         #endif
         User::LeaveIfError(res);
         
-        if(codeInfo.iRemainingEntryAttempts == KMaxNumberOfPINAttempts)
+        if( codeInfo.iRemainingEntryAttempts >= KMaxNumberOfPINAttempts )
             res = iSecurityDlg->ExecuteLD(R_PIN_REQUEST_QUERY);
         else if(codeInfo.iRemainingEntryAttempts > KLastRemainingInputAttempt)
             {
@@ -1300,7 +1300,7 @@
         CSecUiLockObserver* queryStatusObserver = CSecUiLockObserver::NewL(iSecurityDlg, ESecUiRequestStateObserver);
         CleanupStack::PushL(queryStatusObserver);
         
-        if(codeInfo.iRemainingEntryAttempts == KMaxNumberOfPINAttempts)
+        if( codeInfo.iRemainingEntryAttempts >= KMaxNumberOfPINAttempts )
             res = iSecurityDlg->ExecuteLD(R_PIN_QUERY);
         else if(codeInfo.iRemainingEntryAttempts > KLastRemainingInputAttempt)
             {
@@ -1928,7 +1928,7 @@
             res = wait->WaitForRequestL();
             User::LeaveIfError(res);
             
-            if(codeInfo.iRemainingEntryAttempts == KMaxNumberOfPINAttempts)
+            if( codeInfo.iRemainingEntryAttempts >= KMaxNumberOfPINAttempts )
                 res = iSecurityDlg->ExecuteLD(R_UPIN_REQUEST_QUERY);
             else if(codeInfo.iRemainingEntryAttempts > KLastRemainingInputAttempt)
                 {
@@ -1974,7 +1974,7 @@
     		CSecUiLockObserver* queryStatusObserver = CSecUiLockObserver::NewL(iSecurityDlg, ESecUiRequestStateObserver);
             CleanupStack::PushL(queryStatusObserver);
             
-            if(codeInfo.iRemainingEntryAttempts == KMaxNumberOfPINAttempts)
+            if( codeInfo.iRemainingEntryAttempts >= KMaxNumberOfPINAttempts )
                 res = iSecurityDlg->ExecuteLD(R_UPIN_QUERY);
             else if(codeInfo.iRemainingEntryAttempts > KLastRemainingInputAttempt)
                 {