diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicInstantMessagingJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicInstantMessagingJabberImpl.java
index acd08dbc6..eb5b30469 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicInstantMessagingJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicInstantMessagingJabberImpl.java
@@ -790,9 +790,15 @@ public void run()
                 if(failedKeepalivePackets == 3)
                 {
                     logger.error("unregistering.");
-//                    fireUnregisterd();
-                    jabberProvider
-                        .reregister(SecurityAuthority.CONNECTION_FAILED);
+
+                    jabberProvider.unregister(false);
+
+                    jabberProvider.fireRegistrationStateChanged(
+                        jabberProvider.getRegistrationState(),
+                        RegistrationState.CONNECTION_FAILED,
+                        RegistrationStateChangeEvent.REASON_SERVER_NOT_FOUND,
+                        null);
+
                     failedKeepalivePackets = 0;
                 }
             }
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 df51aa276..e2f0c8387 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
@@ -602,7 +602,7 @@ public void unregister()
      * Unregister and fire the event if requested
      * @param fireEvent boolean
      */
-    private void unregister(boolean fireEvent)
+    void unregister(boolean fireEvent)
     {
         synchronized(initializationLock)
         {