2 files changed, 7 insertions, 1 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index fdfab98..7ff3ed0 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -247,6 +247,7 @@ void MainController::resetCurrentError() {
 }
 
 void MainController::handleConnected() {
+	boundJID_ = client_->getBoundJID();
 	loginWindow_->setIsLoggingIn(false);
 	resetCurrentError();
 	resetPendingReconnects();
@@ -419,7 +420,11 @@ void MainController::performLoginFromCachedCredentials() {
 		/* In case we're in the middle of another login, make sure they don't overlap */
 		client_->disconnect();
 	}
-	client_->connect();
+	if (boundJID_.isValid() && jid_.isBare()) {
+		client_->connect(boundJID_);
+	} else {
+		client_->connect();
+	}
 }
 
 void MainController::handleError(const ClientError& error) {
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h
index c0885b6..ed2cee2 100644
--- a/Swift/Controllers/MainController.h
+++ b/Swift/Controllers/MainController.h
@@ -157,6 +157,7 @@ namespace Swift {
 			boost::shared_ptr<DiscoInfo> serverDiscoInfo_;
 			XMPPRoster* xmppRoster_;;
 			JID jid_;
+			JID boundJID_;
 			PresenceOracle* presenceOracle_;
 			SystemTrayController* systemTrayController_;
 			SoundEventController* soundEventController_;