diff --git a/res/values-FR/strings.xml b/res/values-FR/strings.xml
index 9f8a89fab..6913a23f2 100644
--- a/res/values-FR/strings.xml
+++ b/res/values-FR/strings.xml
@@ -203,6 +203,7 @@
 	<string name="pref_help_outbound_proxy">Faire passer tous les appels via le serveur mandataire SIP</string>
 	<string name="pref_help_username">Exemple: john si votre compte est john@sip.example.org</string>
 	<string name="pref_help_domain">sip.example.org si votre compte est john@sip.example.org</string>
+	<string name="pref_help_password">Vous devrez retaper votre mot de passe si vous changez votre nom d\'utilisateur ou le domaine</string>
 	
 	<string name="delete">Supprimer</string>
 	<string name="chat">Chat</string>
diff --git a/res/values-RU/strings.xml b/res/values-RU/strings.xml
index f384bfd70..543d40091 100755
--- a/res/values-RU/strings.xml
+++ b/res/values-RU/strings.xml
@@ -250,6 +250,7 @@
 	<string name="pref_help_outbound_proxy">Отправить все звонки через SIP прокси</string>
 	<string name="pref_help_username">Например: john если Ваш адрес john@sip.example.org</string>
 	<string name="pref_help_domain">sip.example.org если Ваш адрес john@sip.example.org</string>
+	<string name="pref_help_password">You have to re-enter your password if you edit the username and/or the domain</string>
 	
 	<string name="delete">Удалить</string>
 	<string name="chat">Чат</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 31657af9b..1324d3636 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -248,6 +248,7 @@
 	<string name="pref_help_outbound_proxy">Route all calls through SIP proxy</string>
 	<string name="pref_help_username">Example: john if your account is john@sip.example.org</string>
 	<string name="pref_help_domain">sip.example.org if your account is john@sip.example.org</string>
+	<string name="pref_help_password">You have to re-enter your password if you edit your username and/or the domain</string>
 	
 	<string name="delete">Delete</string>
 	<string name="chat">Chat</string>
diff --git a/res/xml/account_preferences.xml b/res/xml/account_preferences.xml
index 02e09b2a4..ae8bcd940 100644
--- a/res/xml/account_preferences.xml
+++ b/res/xml/account_preferences.xml
@@ -17,6 +17,7 @@
         
         <EditTextPreference 
         	android:title="@string/pref_passwd"
+        	android:dialogMessage="@string/pref_help_password"
             android:persistent="true"/>
         
         <EditTextPreference 
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 0059fbe67..7cca6416a 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -1003,7 +1003,6 @@ public class LinphoneManager implements LinphoneCoreListener {
 			mAudioManager.setMode(MODE_RINGTONE);
 		}
 
-		routeAudioToSpeaker();
 		try {
 			if ((mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE || mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_NORMAL) && mVibrator != null) {
 				long[] patern = {0,1000,1000};