diff --git a/res/raw/assistant_create.rc b/res/raw/assistant_create.rc
index e6fe33ffb..bcfa7a073 100644
--- a/res/raw/assistant_create.rc
+++ b/res/raw/assistant_create.rc
@@ -7,7 +7,7 @@
     <entry name="quality_reporting_collector" overwrite="true">sip:voip-metrics@sip.linphone.org;transport=tls</entry>
     <entry name="quality_reporting_enabled" overwrite="true">1</entry>
     <entry name="quality_reporting_interval" overwrite="true">180</entry>
-    <entry name="reg_expires" overwrite="true">600</entry>
+    <entry name="reg_expires" overwrite="true">31536000</entry>
     <entry name="reg_identity" overwrite="true">sip:?@sip.linphone.org</entry>
     <entry name="reg_proxy" overwrite="true">&lt;sip:sip.linphone.org;transport=tls&gt;</entry>
     <entry name="reg_sendregister" overwrite="true">1</entry>
diff --git a/src/android/org/linphone/LinphonePreferences.java b/src/android/org/linphone/LinphonePreferences.java
index 17061f1d4..6b0f61c2e 100644
--- a/src/android/org/linphone/LinphonePreferences.java
+++ b/src/android/org/linphone/LinphonePreferences.java
@@ -362,7 +362,9 @@ public class LinphonePreferences {
 			if (tempExpire != null) {
 				try {
 					prxCfg.setExpires(Integer.parseInt(tempExpire));
-				} catch (NumberFormatException nfe) { }
+				} catch (NumberFormatException nfe) {
+					throw new LinphoneCoreException(nfe);
+				}
 			}
 
 			prxCfg.enableAvpf(tempAvpfEnabled);
diff --git a/src/android/org/linphone/assistant/AssistantActivity.java b/src/android/org/linphone/assistant/AssistantActivity.java
index a0a14851b..93ef61c93 100644
--- a/src/android/org/linphone/assistant/AssistantActivity.java
+++ b/src/android/org/linphone/assistant/AssistantActivity.java
@@ -365,9 +365,6 @@ private static AssistantActivity instance;
 
 			proxyConfig.setIdentity(addr.asString());
 
-			if (LinphonePreferences.instance() != null)
-				proxyConfig.setContactUriParameters(LinphonePreferences.instance().getPushNotificationRegistrationID());
-
 			if (accountCreator.getPhoneNumber() != null && accountCreator.getPhoneNumber().length() > 0)
 				proxyConfig.setDialPrefix(accountCreator.getPrefix(accountCreator.getPhoneNumber()));
 
@@ -388,6 +385,9 @@ private static AssistantActivity instance;
 
 			lc.setDefaultProxyConfig(proxyConfig);
 
+			if (LinphonePreferences.instance() != null)
+				LinphonePreferences.instance().setPushNotificationEnabled(true);
+
             if (ContactsManager.getInstance() != null)
                 ContactsManager.getInstance().fetchContactsAsync();