diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp
index 4b837140e..8d9185862 100644
--- a/src/blackgui/components/logincomponent.cpp
+++ b/src/blackgui/components/logincomponent.cpp
@@ -294,17 +294,25 @@ namespace BlackGui
                 if (msg.isSuccess())
                 {
                     Q_ASSERT_X(currentServer.isValidForLogin(), Q_FUNC_INFO, "invalid server");
+                    static const QString extraInfo("[%1]");
+                    sGui->setExtraWindowTitle(extraInfo.arg(ownAircraft.getCallsignAsString()));
                     m_networkSetup.setLastServer(currentServer);
                     m_lastAircraftModel.set(ownAircraft.getModel());
                     ui->le_HomeBase->setText(currentServer.getUser().getHomeBase().asString());
                     if (vatsimLogin) { m_networkSetup.setLastVatsimServer(currentServer); }
                 }
+                else
+                {
+                    sGui->setExtraWindowTitle("");
+                }
             }
             else
             {
                 // disconnect from network
                 sGui->getIContextAudio()->leaveAllVoiceRooms();
+                sGui->setExtraWindowTitle("");
                 msg = sGui->getIContextNetwork()->disconnectFromNetwork();
+
             }
 
             // log message and trigger events