--- a/phoneapp/phoneuistates/src/cphoneemergency.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphoneemergency.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -445,7 +445,7 @@
     emergencyHeaderParam.SetCipheringIndicatorAllowed(
         iStateMachine->PhoneEngineInfo()->SecureSpecified() );
 
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
 
     // Notify the view
     iViewCommandHandle->ExecuteCommandL(
@@ -461,7 +461,7 @@
         aCallId,
         &headerParam );
 
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
 
     UpdateInCallCbaL();
     }
@@ -474,7 +474,7 @@
     {
     __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::HandleConnectedL() ");
 
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
 
     TPhoneCmdParamCallHeaderData emergencyHeaderParam;
     emergencyHeaderParam.SetCallState( EPEStateConnected );
@@ -484,7 +484,7 @@
         aCallId,
         &emergencyHeaderParam );
 
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     SetToolbarDimming( ETrue );
     UpdateInCallCbaL();
     }
@@ -624,7 +624,7 @@
                     // Show not allowed note
                     SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed );
                     }
-                else
+                else if ( !iStateMachine->SecurityMode()->IsSecurityMode() )
                     {
                     // Logs to open
                     CallFromNumberEntryL();