diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index 5585da4ae..5dec09c55 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -30,6 +30,7 @@ Copyright (C) 2000  Simon MORLAT (simon.morlat@linphone.org)
 /*store current config related to server location*/
 static void linphone_proxy_config_store_server_config(LinphoneProxyConfig* cfg) {
 	cfg->saved_sendregister = cfg->reg_sendregister;
+	cfg->saved_expires = cfg->expires;
 	if (cfg->saved_identity) linphone_address_destroy(cfg->saved_identity);
 	if (cfg->identity_address)
 		cfg->saved_identity = linphone_address_clone(cfg->identity_address);
diff --git a/tester/presence_server_tester.c b/tester/presence_server_tester.c
index 20cdb942c..bbdc42abf 100644
--- a/tester/presence_server_tester.c
+++ b/tester/presence_server_tester.c
@@ -57,6 +57,7 @@ static void simple(void) {
 	linphone_core_set_user_agent(pauline->lc, "full-presence-support", NULL);
 	linphone_core_set_user_agent(marie->lc, "full-presence-support", NULL);
 	enable_publish(pauline, TRUE);
+	BC_ASSERT_TRUE(wait_for(marie->lc,pauline->lc,&pauline->stat.number_of_LinphonePublishOk,1));
 
 	linphone_friend_enable_subscribes(f, TRUE);
 	linphone_friend_set_inc_subscribe_policy(f,LinphoneSPAccept); /* Accept incoming subscription request for this friend*/