--- 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"

--- a/src/com/beem/project/beem/BeemApplication.java	Fri Dec 07 00:43:25 2012 +0100
+++ b/src/com/beem/project/beem/BeemApplication.java	Sat Dec 15 18:15:42 2012 +0100
@@ -68,8 +68,19 @@
     public static final String ACCOUNT_PASSWORD_KEY = "account_password";
     /** Preference key set to true if using an Android account . */
     public static final String USE_SYSTEM_ACCOUNT_KEY = "use_system_account";
+
     /** Preference key for Android account type . */
     public static final String ACCOUNT_SYSTEM_TYPE_KEY = "account_system_type";
+
+    /** Preference key set to true if using specific server details. */
+    public static final String ACCOUNT_SPECIFIC_SERVER_KEY = "account_specific_server";
+
+    /** Preference key for specific server hostname. */
+    public static final String ACCOUNT_SPECIFIC_SERVER_HOST_KEY = "account_specific_server_host";
+
+    /** Preference key for specific server port. */
+    public static final String ACCOUNT_SPECIFIC_SERVER_PORT_KEY = "account_specific_server_port";
+
     /** Preference key for status (available, busy, away, ...). */
     public static final String STATUS_KEY = "status";
     /** Preference key for status message. */

--- a/src/com/beem/project/beem/BeemService.java	Fri Dec 07 00:43:25 2012 +0100
+++ b/src/com/beem/project/beem/BeemService.java	Sat Dec 15 18:15:42 2012 +0100
@@ -167,7 +167,7 @@
 	    mProxyInfo = ProxyInfo.forNoProxy();
 	}
 	boolean useSystemAccount = mSettings.getBoolean(BeemApplication.USE_SYSTEM_ACCOUNT_KEY, false);
-	if (mSettings.getBoolean("settings_key_specific_server", false))
+	if (mSettings.getBoolean(BeemApplication.ACCOUNT_SPECIFIC_SERVER_KEY, false))
 	    mConnectionConfiguration = new ConnectionConfiguration(mHost, mPort, mService, mProxyInfo);
 	if (useSystemAccount) {
 	    SASLAuthentication.supportSASLMechanism(SASLGoogleOAuth2Mechanism.MECHANISM_NAME);
@@ -246,11 +246,11 @@
 	mHost = mService;
 	initMemorizingTrustManager();
 
-	if (mSettings.getBoolean("settings_key_specific_server", false)) {
-	    mHost = mSettings.getString("settings_key_xmpp_server", "").trim();
+	if (mSettings.getBoolean(BeemApplication.ACCOUNT_SPECIFIC_SERVER_KEY, false)) {
+	    mHost = mSettings.getString(BeemApplication.ACCOUNT_SPECIFIC_SERVER_HOST_KEY, "").trim();
 	    if ("".equals(mHost))
 		mHost = mService;
-	    String tmpPort = mSettings.getString("settings_key_xmpp_port", "5222");
+	    String tmpPort = mSettings.getString(BeemApplication.ACCOUNT_SPECIFIC_SERVER_PORT_KEY, "5222");
 	    if (!"".equals(tmpPort))
 		mPort = Integer.parseInt(tmpPort);
 	}