diff --git a/Classes/BuschJaegerConfiguration.m b/Classes/BuschJaegerConfiguration.m
index 19543d1fb..8de486373 100644
--- a/Classes/BuschJaegerConfiguration.m
+++ b/Classes/BuschJaegerConfiguration.m
@@ -318,6 +318,7 @@ static NSString *const CONFIGURATION_HOME_AP_KEY = @"CONFIGURATION_HOME_AP_KEY";
 - (void)reset {
     valid = FALSE;
     [homeAP release];
+    homeAP = nil;
     [history removeAllObjects];
     [outdoorStations removeAllObjects];
     [users removeAllObjects];
@@ -428,7 +429,7 @@ static NSString *const CONFIGURATION_HOME_AP_KEY = @"CONFIGURATION_HOME_AP_KEY";
 }
 
 - (NSMutableSet*)getHistory {
-    NSMutableSet *set;
+    NSMutableSet *set = nil;
     NSString *url = ([self getCurrentRequestType] == BuschJaegerConfigurationRequestType_Local)? network.localHistory: network.globalHistory;
     url = [self addUserNameAndPasswordToUrl:url];
     NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:url] cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData timeoutInterval:5];
diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index c442ca5fb..2c6e65884 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -1465,8 +1465,9 @@ static void audioRouteChangeListenerCallback (
 	NSString* domain = [[NSUserDefaults standardUserDefaults] stringForKey:@"domain_preference"];
 	NSString* accountPassword = [[NSUserDefaults standardUserDefaults] stringForKey:@"password_preference"];
 	//bool configCheckDisable = [[NSUserDefaults standardUserDefaults] boolForKey:@"check_config_disable_preference"];
-	bool isOutboundProxy= [[NSUserDefaults standardUserDefaults] boolForKey:@"outbound_proxy_preference"];
-	
+    /* MODIFICATION always enable outbound*/
+	bool isOutboundProxy=TRUE;// [[NSUserDefaults standardUserDefaults] boolForKey:@"outbound_proxy_preference"];
+	/**/
 	
 	//clear auth info list
 	linphone_core_clear_all_auth_info(theLinphoneCore);
@@ -1476,7 +1477,14 @@ static void audioRouteChangeListenerCallback (
 		const char* identity = [[NSString stringWithFormat:@"sip:%@@%@",username,domain] cStringUsingEncoding:[NSString defaultCStringEncoding]];
 		const char* password = [accountPassword cStringUsingEncoding:[NSString defaultCStringEncoding]];
 		
-		NSString* proxyAddress = [[NSUserDefaults standardUserDefaults] stringForKey:@"proxy_preference"];
+        /* MODIFICATION use config address */
+		NSString* proxyAddress = nil;// [[NSUserDefaults standardUserDefaults] stringForKey:@"proxy_preference"];
+        if([[LinphoneManager getWifiData] isEqualToData:configuration.homeAP]) {
+            proxyAddress = configuration.network.localAddress;
+        } else {
+            proxyAddress = configuration.network.globalAddress;
+        }
+        /**/
 		if ((!proxyAddress || [proxyAddress length] <1 ) && domain) {
 			proxyAddress = [NSString stringWithFormat:@"sip:%@",domain] ;
 		} else {