diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 997c36bead..cc16ffbb78 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -409,8 +409,8 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
-      - name: NPM install
-        run: npm ci
+      - name: Run linter
+        run: npm run lint
 
       - name: NPM build
         run: npm run build:bit:cloud
diff --git a/package.json b/package.json
index a16985c062..8bbc3675c6 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "dist:bit:selfhost": "npm run build:bit:selfhost:prod",
     "deploy": "npm run dist:bit && gh-pages -d build",
     "deploy:dev": "npm run dist:bit && gh-pages -d build -r git@github.com:kspearrin/bitwarden-web-dev.git",
-    "lint": "tslint 'src/**/*.ts' 'bitwarden_license/src/**/*.ts' || true",
+    "lint": "tslint 'src/**/*.ts' 'bitwarden_license/src/**/*.ts'",
     "lint:fix": "tslint 'src/**/*.ts' 'bitwarden_license/src/**/*.ts' --fix"
   },
   "devDependencies": {
diff --git a/src/app/settings/organization-plans.component.ts b/src/app/settings/organization-plans.component.ts
index 8d8d9183c7..3a9ddc944f 100644
--- a/src/app/settings/organization-plans.component.ts
+++ b/src/app/settings/organization-plans.component.ts
@@ -282,8 +282,8 @@ export class OrganizationPlansComponent implements OnInit {
             };
 
             this.formPromise = doSubmit();
-            const orgId = await this.formPromise;
-            this.onSuccess.emit({ organizationId: orgId });
+            const organizationId = await this.formPromise;
+            this.onSuccess.emit({ organizationId: organizationId });
         } catch (e) {
             this.logService.error(e);
         }