--- a/src/com/beem/project/beem/BeemService.java	Mon Mar 21 22:01:51 2011 +0100
+++ b/src/com/beem/project/beem/BeemService.java	Mon Mar 21 22:07:46 2011 +0100
@@ -208,7 +208,8 @@
 	    if ("".equals(mHost))
 		mHost = mService;
 	    String tmpPort = mSettings.getString("settings_key_xmpp_port", "5222");
-	    mPort = ("".equals(tmpPort)) ? DEFAULT_XMPP_PORT : Integer.parseInt(tmpPort);
+	    if (!"".equals(tmpPort))
+		mPort = Integer.parseInt(tmpPort);
 	}
 	if (mSettings.getBoolean(BeemApplication.FULL_JID_LOGIN_KEY, false) ||
 	    "gmail.com".equals(mService) || "googlemail.com".equals(mService))  {

--- a/src/com/beem/project/beem/service/UserInfo.java	Mon Mar 21 22:01:51 2011 +0100
+++ b/src/com/beem/project/beem/service/UserInfo.java	Mon Mar 21 22:07:46 2011 +0100
@@ -76,7 +76,7 @@
      * @param in parcel to use for construction
      */
     private UserInfo(final Parcel in) {
-	mBareJid= in.readString();
+	mBareJid = in.readString();
 	mAvatarId = in.readString();
     }
 
@@ -111,7 +111,7 @@
     /**
      * Set the avater id of the user.
      *
-     * @param avatarId 
+     * @param avatarId the avatar id
      */
     public void setAvatarId(String avatarId) {
 	mAvatarId = avatarId;