--- a/alwayson_net_plugin/pdpcontextmanager2/src/caotimer.cpp	Mon Jan 18 20:33:49 2010 +0200
+++ b/alwayson_net_plugin/pdpcontextmanager2/src/caotimer.cpp	Tue Jan 26 12:12:48 2010 +0200
@@ -210,7 +210,16 @@
     {
     LOG_1( _L("CAOTimer::UnconnectTimerDisabled") );
     
-    return iSettings.UnconnectTimerValue() == 0;
+    if ( iSettings.IsCellularAllowedByUser() )
+        {
+        return iSettings.UnconnectTimerValue() == 0;
+        }
+    else
+        {
+        // There should be no retries because user
+        // does not allow cellular connections.
+        return ETrue;
+        }
     }
 
 // ---------------------------------------------------------------------------