--- a/voipplugins/voipadapters/cpvoipadapter/src/CWPVoIPAdapter.cpp	Fri Mar 12 15:42:09 2010 +0200
+++ b/voipplugins/voipadapters/cpvoipadapter/src/CWPVoIPAdapter.cpp	Mon Mar 15 12:39:55 2010 +0200
@@ -986,7 +986,6 @@
     TLex8 lex( aStorageIdValue );
     User::LeaveIfError( lex.Val( storageId, EDecimal ) );
 
-
     const TInt itemCount = iDatas.Count();
 
     //lint -e{961} No need for else statement here
@@ -999,9 +998,7 @@
 
             TBuf8<KTempStringlength> userAgentHeader;
             iDatas[itemIndex]->GetUserAgentHeaderL( userAgentHeader );
-            // SIPProfileId must be bigger than 1 because otherwise
-            // cSIPManagedProfileRegistry->ProfileL will leave.
-            if ( setOk && storageId > 1 )
+            if ( setOk && storageId > 0 )
                 {
                 TUint32 itemId = iDatas[itemIndex]->ItemId();
                 if ( TUint( KNotSaved ) != itemId )
@@ -1021,7 +1018,6 @@
                     rcseReg->UpdateL( itemId, *rcseProf );
                     CleanupStack::PopAndDestroy( 2, rcseReg );
                     }
-                
 
                 // Then set SIP user-agent header
                 DBG_PRINT(
@@ -1051,7 +1047,7 @@
                     User::LeaveIfError( cSIPManagedProfile->SetParameter( 
                         KSIPHeaders, *uahArray ) );
                     }
-                
+
                 cSIPManagedProfileRegistry->SaveL( *cSIPManagedProfile );
                 uahArray->Reset();
                 CleanupStack::PopAndDestroy( uahArray ); // CS:5
@@ -1067,7 +1063,6 @@
                 } // if ( matches ... )
             } // for
         }
-
     else if ( KErrNone == KSCCPAppID8().CompareF( tmpAppId->Des() ) )
         {
         for ( TInt itemIndex = 0; itemIndex < iDatas.Count(); itemIndex++ )
@@ -1076,7 +1071,6 @@
                 aAppRef );
             }
         }
-
     else if ( KErrNone == KNATFWAppID8().CompareF( tmpAppId->Des() ) )
         {
         for ( TInt itemIndex = 0; itemIndex < iDatas.Count(); itemIndex++ )
@@ -1085,7 +1079,6 @@
                 aAppRef );
             }
         }
-
     else if ( KErrNone == KPresenceAppId8().CompareF( tmpAppId->Des() ) )
         {
         for ( TInt itemIndex = 0; itemIndex < iDatas.Count(); itemIndex++ )
@@ -1094,7 +1087,6 @@
                 storageId, aAppRef );
             }
         }
-
     else if ( KErrNone == KSNAPAppID8().CompareF( tmpAppId->Des() ) )
         {
         for ( TInt itemIndex = 0; itemIndex < iDatas.Count(); itemIndex++ )