--- a/res/xml/preferences.xml	Fri Dec 07 00:43:25 2012 +0100
+++ b/res/xml/preferences.xml	Sat Dec 15 18:15:42 2012 +0100
@@ -141,15 +141,15 @@
 			</PreferenceCategory>
 			<CheckBoxPreference android:title="@string/SettingsAdvancedOptions"
 				android:defaultValue="false" android:summary="@string/SettingsAdvancedSpecOpt"
-				android:key="settings_key_specific_server" />
+				android:key="account_specific_server" />
 			<EditTextPreference android:singleLine="true"
-				android:dependency="settings_key_specific_server" android:name="adresse"
+				android:dependency="account_specific_server" android:name="adresse"
 				android:summary="@string/SettingsAdvancedAddOpt" android:title="@string/settings_xmpp_server"
-				android:key="settings_key_xmpp_server" android:hint="@string/comments_xmpp_server" />
+				android:key="account_specific_server_host" android:hint="@string/comments_xmpp_server" />
 			<EditTextPreference android:singleLine="true"
-				android:dependency="settings_key_specific_server" android:name="port"
+				android:dependency="account_specific_server" android:name="port"
 				android:summary="@string/SettingsAdvancedPortOpt" android:title="@string/settings_xmpp_port"
-				android:defaultValue="5222" android:numeric="signed" android:key="settings_key_xmpp_port"
+				android:defaultValue="5222" android:numeric="signed" android:key="account_specific_server_port"
 				android:hint="@string/comments_xmpp_port" />
 			<CheckBoxPreference android:title="@string/settings_full_jid_login"
 				android:defaultValue="false" android:summary="@string/settings_full_jid_login_sum"