diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index 6aac3f934..e2c17b7e1 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1508,6 +1508,9 @@ public class XmppConnectionService extends Service {
 					thread.start();
 					scheduleWakeupCall((int) (Config.CONNECT_TIMEOUT * 1.2),
 							false);
+				} else {
+					account.getRoster().clearPresences();
+					account.setXmppConnection(null);
 				}
 			}
 		}).start();
diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java
index b789d95fc..54409be45 100644
--- a/src/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -910,8 +910,7 @@ public class XmppConnection implements Runnable {
 	}
 
 	public void disconnect(boolean force) {
-		changeStatus(Account.STATUS_OFFLINE);
-		Log.d(Config.LOGTAG, "disconnecting");
+		Log.d(Config.LOGTAG, account.getJid()+": disconnecting");
 		try {
 			if (force) {
 				socket.close();
@@ -929,6 +928,7 @@ public class XmppConnection implements Runnable {
 								Thread.sleep(100);
 							}
 							tagWriter.writeTag(Tag.end("stream:stream"));
+							socket.close();
 						} catch (IOException e) {
 							Log.d(Config.LOGTAG,
 									"io exception during disconnect");