--- a/vpnui/vpndialogmanager/src/vpndialogmanager.cpp	Tue Sep 14 23:16:15 2010 +0300
+++ b/vpnui/vpndialogmanager/src/vpndialogmanager.cpp	Wed Sep 15 13:20:54 2010 +0300
@@ -68,8 +68,10 @@
             // KMD Dialogs
             case TKmdDialog::EUserPwd:
                 return shower->GetUserPwdDlgL(aNotifier, aInput);
+            case TKmdDialog::ESecurIdCode:
+                return shower->GetSecurIdDlgL(aNotifier, aInput);
             case TKmdDialog::ESecurIdPin:
-                return shower->GetSecurIdDlgL(aNotifier, aInput);
+                return shower->GetSecurIdPinDlgL(aNotifier, aInput);
             case TKmdDialog::ESecurIdNextPin:
                 return shower->GetSecurIdNextDlgL(aNotifier, aInput);
 
@@ -125,6 +127,10 @@
         // Kmd note dialogs
         case TVpnNoteDialog::EKmdAuthenticationFailed:
         	return R_KMD_CRACK_AUTH_FAILED;
+        case TVpnNoteDialog::EKmdTokenNotFound:
+            return R_KMD_TOKEN_NOT_FOUND;
+        case TVpnNoteDialog::EKmdTokenExpired:
+            return R_KMD_TOKEN_EXPIRED;
         default:
             LOG_(" Calling CVpnDialogManagerBase::GetNoteTextId()");
             return CVpnDialogManager::GetNoteTextId(aNoteDialogId);