diff -r 3255e7d5bd67 -r 989397f9511c securitydialogs/SecUi/Src/SecUiSecurityHandler.cpp
--- a/securitydialogs/SecUi/Src/SecUiSecurityHandler.cpp	Thu Oct 07 14:07:34 2010 +0300
+++ b/securitydialogs/SecUi/Src/SecUiSecurityHandler.cpp	Thu Oct 14 13:56:11 2010 +0300
@@ -716,6 +716,17 @@
             isConditionSatisfied = ETrue;
         }
 
+	// call TARM so that it verifies that configuration is in sync. This might internally accept the (default) lock code, but doesn't dismiss the query.
+	RDEBUG("isConditionSatisfied", isConditionSatisfied);
+	RSCPClient scpClientConfiguration;
+	User::LeaveIfError( scpClientConfiguration.Connect() );
+  CleanupClosePushL( scpClientConfiguration );
+	RDEBUG("call CheckConfiguration KSCPComplete", KSCPComplete);
+	TInt finalConfStatus = scpClientConfiguration.CheckConfiguration( KSCPComplete );
+	RDEBUG("finalConfStatus", finalConfStatus);
+	RDEBUG("isConditionSatisfied", isConditionSatisfied);
+	CleanupStack::PopAndDestroy();	// scpClientConfiguration
+
     // Security code at bootup: No "cancel" softkey; Emergency calls enabled.
     RMobilePhone::TMobilePhoneSecurityCode secCodeTypeToAsk = RMobilePhone::ESecurityCodePhonePassword;
     RDEBUG("isConditionSatisfied", isConditionSatisfied);