diff --git a/src/app/accounts/settings.component.html b/src/app/accounts/settings.component.html
index bd790948e45..af7aa285ecb 100644
--- a/src/app/accounts/settings.component.html
+++ b/src/app/accounts/settings.component.html
@@ -128,6 +128,16 @@
                             </div>
                             <small class="help-block">{{startToTrayDescText}}</small>
                         </div>
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <label for="startOnLogin">
+                                    <input id="startOnLogin" type="checkbox" name="StartOnLogin" [(ngModel)]="startOnLogin"
+                                        (change)="saveStartOnLogin()">
+                                    {{'startOnLogin' | i18n}}
+                                </label>
+                            </div>
+                            <small class="help-block">{{'startOnLoginDesc' | i18n}}</small>
+                        </div>
                         <div class="form-group" *ngIf="showAlwaysShowDock">
                             <div class="checkbox">
                                 <label for="alwaysShowDock">
diff --git a/src/app/accounts/settings.component.ts b/src/app/accounts/settings.component.ts
index 8563296e2e1..6f670f04851 100644
--- a/src/app/accounts/settings.component.ts
+++ b/src/app/accounts/settings.component.ts
@@ -51,6 +51,7 @@ export class SettingsComponent implements OnInit {
     biometricText: string;
     alwaysShowDock: boolean;
     showAlwaysShowDock: boolean = false;
+    startOnLogin: boolean;
 
     enableTrayText: string;
     enableTrayDescText: string;
@@ -306,6 +307,10 @@ export class SettingsComponent implements OnInit {
         await this.storageService.save(ElectronConstants.alwaysShowDock, this.alwaysShowDock);
     }
 
+    async saveStartOnLogin() {
+        this.messagingService.send(this.startOnLogin ? 'addOpenAtLogin' : 'removeOpenAtLogin');
+    }
+
     private callAnalytics(name: string, enabled: boolean) {
         const status = enabled ? 'Enabled' : 'Disabled';
         this.analytics.eventTrack.next({ action: `${status} ${name}` });
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index dab599731e0..519794e745d 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -888,6 +888,12 @@
   "startToMenuBarDesc": {
     "message": "When the application is first started, only show an icon in the menu bar."
   },
+  "startOnLogin": {
+    "message": "Start automatically on login"
+  },
+  "startOnLoginDesc": {
+    "message": "Start the Bitwarden Desktop application automatically on login."
+  },
   "alwaysShowDock": {
     "message": "Always show in the Dock"
   },
diff --git a/src/main/messaging.main.ts b/src/main/messaging.main.ts
index 1e3af95e5ba..208a23ff4f1 100644
--- a/src/main/messaging.main.ts
+++ b/src/main/messaging.main.ts
@@ -44,6 +44,10 @@ export class MessagingMain {
             case 'hideToTray':
                 this.main.trayMain.hideToTray();
                 break;
+            case 'addStartOnLogin':
+                break;
+            case 'removeStartOnLogin':
+                break;
             default:
                 break;
         }