diff --git a/src/net/java/sip/communicator/impl/contactlist/MetaContactImpl.java b/src/net/java/sip/communicator/impl/contactlist/MetaContactImpl.java
index c49a1eedd..12ce14c9f 100644
--- a/src/net/java/sip/communicator/impl/contactlist/MetaContactImpl.java
+++ b/src/net/java/sip/communicator/impl/contactlist/MetaContactImpl.java
@@ -278,8 +278,9 @@ public Contact getContact(String contactAddress,
     {
         for (Contact contact : protoContacts)
         {
-            if(   contact.getProtocolProvider() == ownerProvider
-               && contact.getAddress().equals(contactAddress))
+            if(contact.getProtocolProvider() == ownerProvider
+               && (contact.getAddress().equals(contactAddress)
+                    || contact.equals(contactAddress)))
                 return contact;
         }
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/AddContactDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/AddContactDialog.java
index ecabdcb32..428cd0df6 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/AddContactDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/AddContactDialog.java
@@ -283,6 +283,11 @@ public void itemStateChanged(ItemEvent e)
 
             accountCombo.addItem(provider);
         }
+
+        // if we have only select account option and only one account
+        // select the available account
+        if(accountCombo.getItemCount() == 2)
+            accountCombo.setSelectedIndex(1);
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
index 6d30a0c7e..033ff14b0 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
@@ -608,7 +608,9 @@ private void connectAndLogin(SecurityAuthority authority,
                     }
                     catch(NumberFormatException ex)
                     {
-                        throw new OperationFailedException("Wrong port",
+                        throw new OperationFailedException("Wrong proxy port, "
+                                + globalProxyPortStr
+                                + " does not represent an integer",
                             OperationFailedException.INVALID_ACCOUNT_PROPERTIES,
                             ex);
                     }
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java b/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java
index e96104882..9d2c52594 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java
@@ -937,7 +937,8 @@ else if (response.getStatusCode() == Response.INTERVAL_TOO_BRIEF)
         }
         else if ( response.getStatusCode() >= 400 )
         {
-            logger.error("Received an error response.");
+            logger.error("Received an error response ("
+                    + response.getStatusCode() + ")" );
 
             int registrationStateReason =
                 RegistrationStateChangeEvent.REASON_NOT_SPECIFIED;