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 467f3915e..a0cec28e5 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
@@ -919,6 +919,14 @@ private ConnectState connectAndLogin(
 
         connection.connect();
 
+        if(abortConnecting)
+        {
+            abortConnecting = false;
+            disconnectAndCleanConnection();
+
+            return ConnectState.ABORT_CONNECTING;
+        }
+
         registerServiceDiscoveryManager();
 
         if(connectionListener == null)