diff --git a/Resources/assistant_external_sip.rc b/Resources/assistant_external_sip.rc
index 44a7acfe4..a02c1a8c1 100644
--- a/Resources/assistant_external_sip.rc
+++ b/Resources/assistant_external_sip.rc
@@ -13,7 +13,9 @@
 
 	<section name="assistant">
 		<entry name="username_min_length" overwrite="true">1</entry>
-		<entry name="password_min_length" overwrite="true">0</entry>
+		<entry name="password_min_length" overwrite="true">-1</entry>
+		<entry name="username_max_length" overwrite="true">-1</entry>
+		<entry name="password_max_length" overwrite="true">-1</entry>
 		<entry name="xmlrpc_url" overwrite="true"></entry>
 	</section>
 </config>
diff --git a/Resources/assistant_linphone_create.rc b/Resources/assistant_linphone_create.rc
index d404180c4..b9e713e98 100644
--- a/Resources/assistant_linphone_create.rc
+++ b/Resources/assistant_linphone_create.rc
@@ -18,6 +18,8 @@
 		<entry name="username_regex" overwrite="true">^[a-z0-9_.\-]*$</entry>
 		<entry name="username_min_length" overwrite="true">1</entry>
 		<entry name="password_min_length" overwrite="true">1</entry>
+		<entry name="username_max_length" overwrite="true">64</entry>
+		<entry name="password_max_length" overwrite="true">34</entry>
 		<entry name="xmlrpc_url" overwrite="true">https://www.linphone.org/assistant.php</entry>
 	</section>
 </config>
diff --git a/Resources/assistant_linphone_existing.rc b/Resources/assistant_linphone_existing.rc
index d404180c4..b9e713e98 100644
--- a/Resources/assistant_linphone_existing.rc
+++ b/Resources/assistant_linphone_existing.rc
@@ -18,6 +18,8 @@
 		<entry name="username_regex" overwrite="true">^[a-z0-9_.\-]*$</entry>
 		<entry name="username_min_length" overwrite="true">1</entry>
 		<entry name="password_min_length" overwrite="true">1</entry>
+		<entry name="username_max_length" overwrite="true">64</entry>
+		<entry name="password_max_length" overwrite="true">34</entry>
 		<entry name="xmlrpc_url" overwrite="true">https://www.linphone.org/assistant.php</entry>
 	</section>
 </config>
diff --git a/Resources/assistant_remote.rc b/Resources/assistant_remote.rc
index 07ef93c7a..4a609218a 100644
--- a/Resources/assistant_remote.rc
+++ b/Resources/assistant_remote.rc
@@ -11,6 +11,10 @@
 		<entry name="reg_sendregister" overwrite="true">1</entry>
 	</section>
 	<section name="assistant">
+		<entry name="username_min_length" overwrite="true">-1</entry>
+		<entry name="password_min_length" overwrite="true">-1</entry>
+		<entry name="username_max_length" overwrite="true">-1</entry>
+		<entry name="password_max_length" overwrite="true">-1</entry>
 		<entry name="xmlrpc_url" overwrite="true"></entry>
 	</section>
 </config>
diff --git a/submodules/linphone b/submodules/linphone
index 3739d2c86..e7195bb8d 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 3739d2c8669ad122aa402c35e410f82c53aad662
+Subproject commit e7195bb8df88a74a6091c95afcd947897c091e6b