--- a/src/com/beem/project/beem/BeemService.java	Sat Jan 23 00:46:38 2010 +0100
+++ b/src/com/beem/project/beem/BeemService.java	Sun Jan 31 15:41:27 2010 +0100
@@ -205,7 +205,10 @@
 
 	if (mSettings.getBoolean("settings_key_specific_server", false)) {
 	    mHost = mSettings.getString("settings_key_xmpp_server", "");
-	    mPort = Integer.parseInt(mSettings.getString("settings_key_xmpp_port", "5222"));
+	    if ("".equals(mHost))
+		mHost = StringUtils.parseServer(tmpJid);
+	    String tmpPort = mSettings.getString("settings_key_xmpp_port", "5222");
+	    mPort = ("".equals(tmpPort)) ? DEFAULT_XMPP_PORT : Integer.parseInt(tmpPort) ;
 	}
 	if (mSettings.getBoolean("settings_key_gmail", false)) {
 	    mHost = "talk.google.com";