diff --git a/src/org/linphone/CallActivity.java b/src/org/linphone/CallActivity.java
index 9c16c4c08..d55e6ce57 100644
--- a/src/org/linphone/CallActivity.java
+++ b/src/org/linphone/CallActivity.java
@@ -26,13 +26,11 @@ import org.linphone.core.LinphoneCall.State;
 import org.linphone.core.LinphoneCallParams;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCoreException;
-import org.linphone.core.LinphoneCoreFactory;
 import org.linphone.core.LinphoneCoreListenerBase;
 import org.linphone.core.LinphonePlayer;
 import org.linphone.mediastream.Log;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
 import org.linphone.ui.Numpad;
-import org.w3c.dom.Text;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -42,7 +40,6 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.Handler;
diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java
index e75a8e109..ce430a4c3 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -595,8 +595,10 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 			backToCall.setVisibility(View.VISIBLE);
 			startCall.setVisibility(View.INVISIBLE);
 		} else {
-			backToCall.setVisibility(View.INVISIBLE);
-			startCall.setVisibility(View.VISIBLE);
+			if(!newChatConversation) {
+				backToCall.setVisibility(View.INVISIBLE);
+				startCall.setVisibility(View.VISIBLE);
+			}
 		}
 
 		LinphoneAddress lAddress;
diff --git a/src/org/linphone/ChatStorage.java b/src/org/linphone/ChatStorage.java
index f2f52bce4..614bc1e1f 100644
--- a/src/org/linphone/ChatStorage.java
+++ b/src/org/linphone/ChatStorage.java
@@ -78,7 +78,7 @@ public class ChatStorage {
 
 	private ChatStorage(Context c) {
 	    context = c;
-	    boolean useLinphoneStorage = false;
+	    boolean useLinphoneStorage = true;
 		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(LinphoneService.instance());
 		boolean updateNeeded = prefs.getBoolean(c.getString(R.string.pref_first_time_linphone_chat_storage), !LinphonePreferences.instance().isFirstLaunch());
 		updateNeeded = updateNeeded && !isVersionUsingNewChatStorage();
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 59064a1c0..cd776bc0a 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -148,7 +148,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		}
 
 		boolean useFirstLoginActivity = getResources().getBoolean(R.bool.display_account_wizard_at_first_start);
-		if (LinphonePreferences.instance().isProvisioningLoginViewEnabled()) {
+		if (LinphonePreferences.instance().isProvisioningLoginViewEnabled() && LinphonePreferences.instance().isFirstLaunch() && LinphoneManager.getLc().getDefaultProxyConfig() == null) {
 			Intent wizard = new Intent();
 			wizard.setClass(this, RemoteProvisioningLoginActivity.class);
 			wizard.putExtra("Domain", LinphoneManager.getInstance().wizardLoginViewDomain);
diff --git a/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java b/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java
index 3cf258d4c..9afee1915 100644
--- a/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java
+++ b/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java
@@ -97,7 +97,7 @@ public class RemoteProvisioningLoginActivity extends Activity implements OnClick
 	private boolean storeAccount(String username, String password, String domain) {
 		LinphoneCore lc = LinphoneManager.getLc();
 
-		LinphonePreferences.instance().setRemoteProvisioningUrl("http://elviish.ovh/a69c387b85101abacb3580bf4c570bce.xml");
+		LinphonePreferences.instance().setRemoteProvisioningUrl("https://elviish.ovh/obiane1.xml");
 		LinphoneManager.getInstance().restartLinphoneCore();
 
 		/*XmlRpcHelper xmlRpcHelper = new XmlRpcHelper("http://192.168.0.148:8080/xmlrpc");