diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java
index 8992418c9..66adb80ca 100644
--- a/src/org/linphone/assistant/AssistantActivity.java
+++ b/src/org/linphone/assistant/AssistantActivity.java
@@ -113,8 +113,7 @@ private static AssistantActivity instance;
 						if (state == RegistrationState.RegistrationOk) {
 							if (progress != null) progress.dismiss();
 							if (LinphoneManager.getLc().getDefaultProxyConfig() != null) {
-								if (!launchEchoCancellerCalibration(true))
-									launchDownloadCodec();
+								launchEchoCancellerCalibration(true);
 							}
 						} else if (state == RegistrationState.RegistrationFailed) {
 							if (progress != null) progress.dismiss();
@@ -494,8 +493,7 @@ private static AssistantActivity instance;
 	
 	public void isAccountVerified(String username) {
 		Toast.makeText(this, getString(R.string.assistant_account_validated), Toast.LENGTH_LONG).show();
-		if(!launchEchoCancellerCalibration(true))
-			launchDownloadCodec(); // Echo canceller cancel
+		launchEchoCancellerCalibration(true);
 	}
 
 	public void isEchoCalibrationFinished() {
diff --git a/submodules/bctoolbox b/submodules/bctoolbox
index 1af41d701..381df0104 160000
--- a/submodules/bctoolbox
+++ b/submodules/bctoolbox
@@ -1 +1 @@
-Subproject commit 1af41d70117131d2361b8c41ac7009f9e6ae672a
+Subproject commit 381df01040121f427c5d1a533cee017be033487a