diff --git a/src/MatrixClient.cc b/src/MatrixClient.cc
index e42b4184..e053642d 100644
--- a/src/MatrixClient.cc
+++ b/src/MatrixClient.cc
@@ -121,7 +121,13 @@ MatrixClient::onLoginResponse(QNetworkReply *reply)
 
         try {
                 response.deserialize(json);
-                emit loginSuccess(response.getUserId(), server_.host(), response.getAccessToken());
+
+                auto hostname = server_.host();
+
+                if (server_.port() > 0)
+                        hostname = QString("%1:%2").arg(server_.host()).arg(server_.port());
+
+                emit loginSuccess(response.getUserId(), hostname, response.getAccessToken());
         } catch (DeserializationException &e) {
                 qWarning() << "Malformed JSON response" << e.what();
                 emit loginError(tr("Malformed response. Possibly not a Matrix server"));