diff --git a/cockatrice/src/abstractclient.h b/cockatrice/src/abstractclient.h
index 4dc9af2b..6f3b7ede 100644
--- a/cockatrice/src/abstractclient.h
+++ b/cockatrice/src/abstractclient.h
@@ -82,6 +82,8 @@ public:
     ClientStatus getStatus() const { QMutexLocker locker(&clientMutex); return status; }
     void sendCommand(const CommandContainer &cont);
     void sendCommand(PendingCommand *pend);
+
+    const QString getUserName() {return userName;}
     
     static PendingCommand *prepareSessionCommand(const ::google::protobuf::Message &cmd);
     static PendingCommand *prepareRoomCommand(const ::google::protobuf::Message &cmd, int roomId);
diff --git a/cockatrice/src/window_main.cpp b/cockatrice/src/window_main.cpp
index b0878340..7f1c16f1 100644
--- a/cockatrice/src/window_main.cpp
+++ b/cockatrice/src/window_main.cpp
@@ -287,7 +287,7 @@ void MainWindow::setClientStatusTitle()
         case StatusConnecting: setWindowTitle(appName + " - " + tr("Connecting to %1...").arg(client->peerName())); break;
         case StatusDisconnected: setWindowTitle(appName + " - " + tr("Disconnected")); break;
         case StatusLoggingIn: setWindowTitle(appName + " - " + tr("Connected, logging in at %1").arg(client->peerName())); break;
-        case StatusLoggedIn: setWindowTitle(appName + " - " + tr("Logged in at %1").arg(client->peerName())); break;
+        case StatusLoggedIn: setWindowTitle(appName + " - " + tr("Logged in as %1 at %2").arg(client->getUserName()).arg(client->peerName())); break;
         default: setWindowTitle(appName);
     }
 }
diff --git a/cockatrice/translations/cockatrice_es.ts b/cockatrice/translations/cockatrice_es.ts
index c2495a07..de4f7cb7 100644
--- a/cockatrice/translations/cockatrice_es.ts
+++ b/cockatrice/translations/cockatrice_es.ts
@@ -1712,7 +1712,7 @@ La versión local es %1, la versión remota es %2.</translation>
     </message>
     <message>
         <location filename="../src/window_main.cpp" line="290"/>
-        <source>Logged in at %1</source>
+        <source>Logged in as %1 at %2</source>
         <translation>Conectado en %1</translation>
     </message>
     <message>