--- a/src/com/beem/project/beem/BeemService.java	Sun Sep 27 15:25:50 2009 +0200
+++ b/src/com/beem/project/beem/BeemService.java	Sun Sep 27 17:59:13 2009 +0200
@@ -107,11 +107,12 @@
 
 	super.onCreate();
 	mSettings = PreferenceManager.getDefaultSharedPreferences(this);
-	mLogin = mSettings.getString("settings_key_account_username", "");
+	String tmpJid = mSettings.getString("settings_key_account_username", ""); 
+	mLogin = StringUtils.parseName(tmpJid);
 	mPassword = mSettings.getString("settings_key_account_password", "");
 	mPort = DEFAULT_XMPP_PORT;
-	mService = StringUtils.parseServer(mLogin);
-	mHost = StringUtils.parseServer(mLogin);
+	mService = StringUtils.parseServer(tmpJid);
+	mHost = StringUtils.parseServer(tmpJid);
 
 	if (mSettings.getBoolean("settings_key_specific_server", false)) {
 	    mHost = mSettings.getString("settings_key_xmpp_server", "");

--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Sun Sep 27 15:25:50 2009 +0200
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Sun Sep 27 17:59:13 2009 +0200
@@ -146,6 +146,8 @@
 	    Log.d(TAG, "Error while connecting", e);
 	    if (e.getXMPPError() != null && e.getXMPPError().getMessage() != null)
 		mConListener.connectionFailed(e.getXMPPError().getMessage());
+	    else if (e.getMessage() != null)
+		mConListener.connectionFailed(e.getMessage());
 	    else
 		mConListener.connectionFailed("Error On Connection");
 	}