diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4bf02bf..f8d8252c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,9 +11,11 @@
 
 #### Windows
 - Added the tooltip for the tray icon in order to show count of unread channels/mantions.
+- Added the option to launch the application on login.
 
 #### Linux
 - Added the option to show the icon on menu bar. (requires libappindicator1 on Ubuntu)
+- Added the option to launch the application on login.
 
 
 ## Release v1.2.1 (Beta)
diff --git a/docs/setup.md b/docs/setup.md
index 324e5440..04e54f43 100644
--- a/docs/setup.md
+++ b/docs/setup.md
@@ -122,6 +122,8 @@ The Settings Page is available from the **File** menu under **Settings** (Click
    - **Allow insecure contents**
       - If your team is hosted on `https://`, images with `http://` are not rendered by default.
         This option allows such images to be rendered, but please be careful for security.
+   - **Start app on login** (Windows, Linux)
+      - This option starts the application when you login.
 
 
 ## Menu Bar