diff --git a/appveyor.yml b/appveyor.yml
index 2570b242..bd4e0b22 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -48,7 +48,7 @@ install:
 - ps: |
     if($isWindows) {
       #$keytarVersion = (Get-Content -Raw -Path .\src\package.json | ConvertFrom-Json).dependencies.keytar
-      $keytarVersion = "4.4.1"
+      $keytarVersion = "4.3.0"
       $nodeModVersion = node -e "console.log(process.config.variables.node_module_version)"
       $keytarTar = "keytar-v${keytarVersion}-node-v${nodeModVersion}-{0}-x64.tar"
       $keytarTarGz = "${keytarTar}.gz"
diff --git a/jslib b/jslib
index b5b4222b..d4c2b20a 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit b5b4222b325a5fab7fabfd53f23de1876ffccec8
+Subproject commit d4c2b20a2594fcac1fdabf312b7289657b4af0c8
diff --git a/src/program.ts b/src/program.ts
index 5d67bae6..15c31088 100644
--- a/src/program.ts
+++ b/src/program.ts
@@ -7,6 +7,8 @@ import { ConfigCommand } from './commands/config.command';
 import { SyncCommand } from './commands/sync.command';
 import { TestCommand } from './commands/test.command';
 
+import { LoginCommand } from 'jslib/cli/commands/login.command';
+import { LogoutCommand } from 'jslib/cli/commands/logout.command';
 import { UpdateCommand } from 'jslib/cli/commands/update.command';
 
 import { BaseProgram } from 'jslib/cli/baseProgram';
@@ -65,6 +67,47 @@ export class Program extends BaseProgram {
             writeLn('', true);
         });
 
+        program
+            .command('login [email] [password]')
+            .description('Log into a user account.')
+            .option('--method <method>', 'Two-step login method.')
+            .option('--code <code>', 'Two-step login code.')
+            .on('--help', () => {
+                writeLn('\n  Notes:');
+                writeLn('');
+                writeLn('    See docs for valid `method` enum values.');
+                writeLn('');
+                writeLn('  Examples:');
+                writeLn('');
+                writeLn('    bw login');
+                writeLn('    bw login john@example.com myPassword321');
+                writeLn('    bw login john@example.com myPassword321 --method 1 --code 249213');
+                writeLn('', true);
+            })
+            .action(async (email: string, password: string, cmd: program.Command) => {
+                await this.exitIfAuthed();
+                const command = new LoginCommand(this.main.authService, this.main.apiService, this.main.i18nService);
+                const response = await command.run(email, password, cmd);
+                this.processResponse(response);
+            });
+
+        program
+            .command('logout')
+            .description('Log out of the current user account.')
+            .on('--help', () => {
+                writeLn('\n  Examples:');
+                writeLn('');
+                writeLn('    bw logout');
+                writeLn('', true);
+            })
+            .action(async (cmd) => {
+                await this.exitIfNotAuthed();
+                const command = new LogoutCommand(this.main.authService, this.main.i18nService,
+                    async () => await this.main.logout());
+                const response = await command.run(cmd);
+                this.processResponse(response);
+            });
+
         program
             .command('test')
             .description('Test a simulated sync.')
@@ -136,7 +179,8 @@ export class Program extends BaseProgram {
                 writeLn('', true);
             })
             .action(async (cmd) => {
-                const command = new UpdateCommand(this.main.platformUtilsService, 'directory-connector', 'bwdc');
+                const command = new UpdateCommand(this.main.platformUtilsService, this.main.i18nService,
+                    'directory-connector', 'bwdc', false);
                 const response = await command.run(cmd);
                 this.processResponse(response);
             });