diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c762f9f4f..6cc241f2c 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
         android:name="android.hardware.camera"
         android:required="false" />
 
-    <!-- Needed to be able to detect a GSM call and thus pause any active SIP call -->
+    <!-- Needed to be able to detect a GSM call and thus pause any active SIP call, and auto fill the phone number field in assistant -->
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <!-- Needed to be able to pick images from SD card to share in chat message -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
diff --git a/app/src/main/java/org/linphone/assistant/AssistantActivity.java b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
index 6b26112a9..4c5521293 100644
--- a/app/src/main/java/org/linphone/assistant/AssistantActivity.java
+++ b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
@@ -122,6 +122,13 @@ public abstract class AssistantActivity extends LinphoneGenericActivity
             Log.e("[Assistant] Account creator couldn't create proxy config");
             // TODO: display error message
         } else {
+            if (proxyConfig.getDialPrefix() == null) {
+                DialPlan dialPlan = getDialPlanForCurrentCountry();
+                if (dialPlan != null) {
+                    proxyConfig.setDialPrefix(dialPlan.getCountryCallingCode());
+                }
+            }
+
             LinphonePreferences.instance().firstLaunchSuccessful();
             goToLinphoneActivity();
         }
diff --git a/app/src/main/java/org/linphone/assistant/GenericConnectionAssistantActivity.java b/app/src/main/java/org/linphone/assistant/GenericConnectionAssistantActivity.java
index 28f2f951d..5d273599d 100644
--- a/app/src/main/java/org/linphone/assistant/GenericConnectionAssistantActivity.java
+++ b/app/src/main/java/org/linphone/assistant/GenericConnectionAssistantActivity.java
@@ -70,7 +70,6 @@ public class GenericConnectionAssistantActivity extends AssistantActivity implem
         mAccountCreator.setDomain(mDomain.getText().toString());
         mAccountCreator.setPassword(mPassword.getText().toString());
         mAccountCreator.setDisplayName(mDisplayName.getText().toString());
-        // TODO: add support for user-id in account creator
 
         switch (mTransport.getCheckedRadioButtonId()) {
             case R.id.transport_udp:
diff --git a/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java b/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
index a4c10bc91..47cfd7452 100644
--- a/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
+++ b/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
@@ -44,7 +44,6 @@ class AsyncContactsLoader extends AsyncTask<Void, Void, AsyncContactsLoader.Asyn
     @SuppressLint("InlinedApi")
     public static final String[] PROJECTION = {
         ContactsContract.Data.CONTACT_ID,
-        ContactsContract.Contacts.LOOKUP_KEY,
         ContactsContract.Contacts.DISPLAY_NAME_PRIMARY,
         ContactsContract.Data.MIMETYPE,
         ContactsContract.Contacts.STARRED,
@@ -128,8 +127,6 @@ class AsyncContactsLoader extends AsyncTask<Void, Void, AsyncContactsLoader.Asyn
                 String id = c.getString(c.getColumnIndex(ContactsContract.Data.CONTACT_ID));
                 boolean starred =
                         c.getInt(c.getColumnIndex(ContactsContract.Contacts.STARRED)) == 1;
-                String lookupKey =
-                        c.getString(c.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY));
 
                 LinphoneContact contact = androidContactsCache.get(id);
                 if (contact == null) {
diff --git a/app/src/main/java/org/linphone/settings/AccountSettingsFragment.java b/app/src/main/java/org/linphone/settings/AccountSettingsFragment.java
index a7cba5a3a..52ebc01be 100644
--- a/app/src/main/java/org/linphone/settings/AccountSettingsFragment.java
+++ b/app/src/main/java/org/linphone/settings/AccountSettingsFragment.java
@@ -155,6 +155,7 @@ public class AccountSettingsFragment extends SettingsFragment {
         mExpire.setInputType(InputType.TYPE_CLASS_NUMBER);
 
         mPrefix = mRootView.findViewById(R.id.pref_prefix);
+        mPrefix.setInputType(InputType.TYPE_CLASS_NUMBER);
 
         mAvpfInterval = mRootView.findViewById(R.id.pref_avpf_rr_interval);
         mAvpfInterval.setInputType(InputType.TYPE_CLASS_NUMBER);
@@ -537,10 +538,19 @@ public class AccountSettingsFragment extends SettingsFragment {
                                 core.removeAuthInfo(mAuthInfo);
                             }
                         }
+
+                        // Set a new default proxy config if the current one has been removed
+                        if (core != null && core.getDefaultProxyConfig() == null) {
+                            ProxyConfig[] proxyConfigs = core.getProxyConfigList();
+                            if (proxyConfigs.length > 0) {
+                                core.setDefaultProxyConfig(proxyConfigs[0]);
+                            }
+                        }
+
                         ((SettingsActivity) getActivity())
                                 .getSideMenuFragment()
                                 .displayAccountsInSideMenu();
-                        ((SettingsActivity) getActivity()).popBackStack();
+                        ((SettingsActivity) getActivity()).goBack();
                     }
                 });
 
diff --git a/app/src/main/java/org/linphone/settings/SettingsActivity.java b/app/src/main/java/org/linphone/settings/SettingsActivity.java
index 8f1cf07f0..ef432fc85 100644
--- a/app/src/main/java/org/linphone/settings/SettingsActivity.java
+++ b/app/src/main/java/org/linphone/settings/SettingsActivity.java
@@ -89,7 +89,6 @@ public class SettingsActivity extends MainActivity {
 
     @Override
     public void goBack() {
-        // 1 is for the empty fragment on tablets
         if (!isTablet()) {
             if (popBackStack()) {
                 showTopBarWithTitle(getString(R.string.settings));
diff --git a/sample/app/src/main/java/org/linphone/sample/LinphoneService.java b/sample/app/src/main/java/org/linphone/sample/LinphoneService.java
index 6f0dad902..787d0b0e9 100644
--- a/sample/app/src/main/java/org/linphone/sample/LinphoneService.java
+++ b/sample/app/src/main/java/org/linphone/sample/LinphoneService.java
@@ -81,6 +81,7 @@ public class LinphoneService extends Service {
                 Toast.makeText(LinphoneService.this, message, Toast.LENGTH_SHORT).show();
 
                 if (state == Call.State.IncomingReceived) {
+                    Toast.makeText(LinphoneService.this, "Incoming call received, answering it automatically", Toast.LENGTH_LONG).show();
                     // For this sample we will automatically answer incoming calls
                     CallParams params = getCore().createCallParams(call);
                     params.enableVideo(true);