diff --git a/src/org/linphone/AccountPreferencesFragment.java b/src/org/linphone/AccountPreferencesFragment.java
index 036a57de7..76c38cc53 100644
--- a/src/org/linphone/AccountPreferencesFragment.java
+++ b/src/org/linphone/AccountPreferencesFragment.java
@@ -96,7 +96,7 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
     	outboundProxy.setKey(getString(R.string.pref_enable_outbound_proxy_key) + key);
    
     	final Preference disable = advanced.getPreference(2);
-    	disable.setEnabled(prefs.getInt(getString(R.string.pref_default_account_key), 0) != n);
+    	disable.setEnabled(true);
     	Compatibility.setPreferenceChecked(disable, prefs.getBoolean(getString(R.string.pref_disable_account_key) + key, false));
     	disable.setKey(getString(R.string.pref_disable_account_key) + key);
 
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index ffae79063..db4ab909f 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -762,6 +762,8 @@ public class LinphoneActivity extends FragmentActivity implements
 			LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
 			if (lc != null && lc.getDefaultProxyConfig() != null)
 				statusFragment.registrationStateChanged(lc.getDefaultProxyConfig().getState());
+			else
+				statusFragment.registrationStateChanged(RegistrationState.RegistrationNone);
 		}
 	}
 
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index c0f6dc055..7ba4aad95 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -592,7 +592,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		copyIfNotExist(R.raw.ringback,mRingbackSoundFile);
 		copyIfNotExist(R.raw.toy_mono,mPauseSoundFile);
 		copyFromPackage(R.raw.linphonerc, new File(mLinphoneInitialConfigFile).getName());
-		//copyIfNotExist(R.raw.lpconfig, new File(mLPConfigXsd).getName());
+		copyIfNotExist(R.raw.lpconfig, new File(mLPConfigXsd).getName());
 		copyIfNotExist(R.raw.rootca, new File(mLinphoneRootCaFile).getName());
 	}
 	private  void copyIfNotExist(int ressourceId,String target) throws IOException {