--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/PnpProvisioningDocument.cpp	Thu Jan 07 12:39:15 2010 +0200
+++ b/pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/PnpProvisioningDocument.cpp	Mon Jan 18 20:09:30 2010 +0200
@@ -237,11 +237,11 @@
         
 
     TInt numSaved( 0 );
-    CPnpProvisioningSaver* saver = new(ELeave) CPnpProvisioningSaver( *wpengine, EFalse );
+    CPnpProvisioningSaver* saver = new(ELeave) CPnpProvisioningSaver( *wpengine, EFalse, EFalse );
     TInt retValue( KErrNone );
     LOGSTRING("saver created");
     // dismiss waitdialog, saver will show own waitdialog
-    iAppUi->WaitDialogDismissedL(EAknSoftkeyEmpty);
+    //iAppUi->WaitDialogDismissedL(EAknSoftkeyEmpty);
   
     TRAPD( saverErr, retValue = saver->ExecuteLD( numSaved ) );
     
@@ -328,8 +328,17 @@
         if( setAsDefault )
             {
             LOGSTRING( "create setter" );
-            CPnpProvisioningSaver* setter = new(ELeave) CPnpProvisioningSaver( *wpengine, ETrue );          
+            CPnpProvisioningSaver* setter = NULL;
             TInt numSet( 0 );
+            if(!activate)
+            {
+            setter = new(ELeave) CPnpProvisioningSaver( *wpengine, ETrue, ETrue );          
+            iAppUi->WaitDialogDismissedL(EAknSoftkeyEmpty);
+            }
+            else
+            {
+            setter = new(ELeave) CPnpProvisioningSaver( *wpengine, ETrue, EFalse );          
+            }
             LOGSTRING( "setter->ExecuteLD" );
             setter->ExecuteLD( numSet );
             }
@@ -347,12 +356,6 @@
         globalNote->ShowNoteL( EAknGlobalInformationNote , *msgTextSaved );
         CleanupStack::PopAndDestroy( 2 );
         }
-        else
-        {
-        CPnpServiceActivation *service = CPnpServiceActivation::NewLC();
-        service->DisplayAppSpecNoteL();
-        CleanupStack::PopAndDestroy();
-       	}
          
     }
     else