diff --git a/src/widgets/Window.cpp b/src/widgets/Window.cpp
index c291be6c2..3712388bd 100644
--- a/src/widgets/Window.cpp
+++ b/src/widgets/Window.cpp
@@ -388,24 +388,34 @@ void Window::onAccountSelected()
 {
     auto user = getApp()->accounts->twitch.getCurrent();
 
-    // update title
-    this->setWindowTitle(Version::instance().fullVersion());
+    // update title (also append username on Linux and MacOS)
+    QString windowTitle = Version::instance().fullVersion();
 
-    // update user
+#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
     if (user->isAnon())
     {
-        if (this->userLabel_)
-        {
-            this->userLabel_->getLabel().setText("anonymous");
-        }
+        windowTitle += " - not logged in";
     }
     else
     {
-        if (this->userLabel_)
+        windowTitle += " - " + user->getUserName();
+    }
+#endif
+
+    this->setWindowTitle(windowTitle);
+
+    // update user
+    if (this->userLabel_)
+    {
+        if (user->isAnon())
+        {
+            this->userLabel_->getLabel().setText("anonymous");
+        }
+        else
         {
             this->userLabel_->getLabel().setText(user->getUserName());
         }
     }
-}  // namespace chatterino
+}
 
 }  // namespace chatterino
diff --git a/src/widgets/settingspages/GeneralPage.cpp b/src/widgets/settingspages/GeneralPage.cpp
index f259148ba..923aa31be 100644
--- a/src/widgets/settingspages/GeneralPage.cpp
+++ b/src/widgets/settingspages/GeneralPage.cpp
@@ -307,7 +307,7 @@ void GeneralPage::initLayout(SettingsLayout &layout)
     layout.addCheckbox("Restart on crash", s.restartOnCrash);
     if (!BaseWindow::supportsCustomWindowFrame())
     {
-        layout.addCheckbox("Show preferences button (ctrl+p to show)",
+        layout.addCheckbox("Show preferences button (Ctrl+P to show)",
                            s.hidePreferencesButton, true);
         layout.addCheckbox("Show user button", s.hideUserButton, true);
     }