diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m
index bf2fbc101..fd5ccdb4e 100644
--- a/Classes/LinphoneAppDelegate.m
+++ b/Classes/LinphoneAppDelegate.m
@@ -138,7 +138,7 @@
                                  @"NO", @"mpeg4_preference",
                                  @"YES", @"pcmu_preference",
                                  @"YES", @"pcma_preference",
-                                 @"tcp", @"transport_preference",
+                                 @"tls", @"transport_preference",
                                  @"NO", @"enable_srtp_preference",
                                  @"YES", @"backgroundmode_preference",
                                  @"YES", @"outbound_proxy_preference",
diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 45cb212c8..6c259c316 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -1448,19 +1448,6 @@ static void audioRouteChangeListenerCallback (
     policy.automatically_initiate = [[NSUserDefaults standardUserDefaults] boolForKey:@"start_video_preference"];
     linphone_core_set_video_policy(theLinphoneCore, &policy);
     
-	UIDevice* device = [UIDevice currentDevice];
-	bool backgroundSupported = false;
-	if ([device respondsToSelector:@selector(isMultitaskingSupported)])
-		backgroundSupported = [device isMultitaskingSupported];
-	
-    BOOL isbackgroundModeEnabled;
-	if (backgroundSupported) {
-		isbackgroundModeEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:@"backgroundmode_preference"];
-	} else {
-		isbackgroundModeEnabled=false;
-	}
-    lp_config_set_int(linphone_core_get_config(theLinphoneCore),"app","backgroundmode_preference", isbackgroundModeEnabled);
-    
     [currentSettings release];
     currentSettings = newSettings;
     [currentSettings retain];
diff --git a/Resources/linphonerc b/Resources/linphonerc
index b119f76f0..1af110b08 100644
--- a/Resources/linphonerc
+++ b/Resources/linphonerc
@@ -1,7 +1,7 @@
 [sip]
+sip_port=0
+sip_tls_port=5061
 sip_random_port=1
-sip_tcp_random_port=1
-sip_tls_random_port=1
 contact="Linphone iPhone" <sip:linphone.iphone@unknown-host>
 keepalive_period=30000
 default_proxy=0
diff --git a/Resources/linphonerc~ipad b/Resources/linphonerc~ipad
index f31880409..3eb171337 100644
--- a/Resources/linphonerc~ipad
+++ b/Resources/linphonerc~ipad
@@ -1,7 +1,7 @@
 [sip]
+sip_port=0
+sip_tls_port=5061
 sip_random_port=1
-sip_tcp_random_port=1
-sip_tls_random_port=1
 contact="Linphone iPhone" <sip:linphone.iphone@unknown-host>
 keepalive_period=30000
 default_proxy=0
diff --git a/Settings.bundle/Advanced.plist b/Settings.bundle/Advanced.plist
index 759dc8985..b3d2465e0 100644
--- a/Settings.bundle/Advanced.plist
+++ b/Settings.bundle/Advanced.plist
@@ -58,13 +58,13 @@
 		</dict>
 		<dict>
 			<key>DefaultValue</key>
-                        <false/>
-                        <key>Key</key>
-                        <string>wifi_only_preference</string>
-                        <key>Title</key>
-                        <string>Wifi only</string>
-                        <key>Type</key>
-                        <string>PSToggleSwitchSpecifier</string>
+			<false/>
+			<key>Key</key>
+			<string>wifi_only_preference</string>
+			<key>Title</key>
+			<string>Wifi only</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
 		</dict>
 		<dict>
 			<key>Key</key>
@@ -100,7 +100,7 @@
 		</dict>
 		<dict>
 			<key>DefaultValue</key>
-			<string>udp</string>
+			<string>tls</string>
 			<key>Key</key>
 			<string>transport_preference</string>
 			<key>Title</key>
@@ -140,16 +140,6 @@
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<true/>
-			<key>Key</key>
-			<string>backgroundmode_preference</string>
-			<key>Title</key>
-			<string>Background mode</string>
-			<key>Type</key>
-			<string>PSToggleSwitchSpecifier</string>
-		</dict>
 	</array>
 </dict>
 </plist>