diff --git a/src/popup/app/current/current.component.ts b/src/popup/app/current/current.component.ts
index 35d60eb9f9..b4e402813b 100644
--- a/src/popup/app/current/current.component.ts
+++ b/src/popup/app/current/current.component.ts
@@ -1,9 +1,12 @@
+import * as template from './current.component.html';
+
 import { CipherType } from 'jslib/enums/cipherType';
 
+import { CipherService } from 'jslib/abstractions/cipher.service';
 import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 import { UtilsService } from 'jslib/abstractions/utils.service';
 
-import * as template from './current.component.html';
+import { AutofillService } from '../../../services/abstractions/autofill.service';
 
 export class CurrentController {
     i18n: any;
@@ -12,18 +15,17 @@ export class CurrentController {
     cardCiphers: any = [];
     identityCiphers: any = [];
     loginCiphers: any = [];
-    url: any;
-    domain: any;
+    url: string;
+    domain: string;
     canAutofill: boolean = false;
     searchText: string = null;
     inSidebar: boolean = false;
     disableSearch: boolean = false;
 
-    constructor($scope: any, private cipherService: any,
-        private platformUtilsService: PlatformUtilsService,
+    constructor($scope: any, private cipherService: CipherService, private platformUtilsService: PlatformUtilsService,
         private utilsService: UtilsService, private toastr: any, private $window: ng.IWindowService,
-        private $state: any, private $timeout: ng.ITimeoutService, private autofillService: any,
-        private $analytics: any, private i18nService: any, private $filter: any) {
+        private $state: any, private $timeout: ng.ITimeoutService, private autofillService: AutofillService,
+        private $analytics: any, private i18nService: any, private $filter: ng.IFilterService) {
         this.i18n = i18nService;
         this.inSidebar = platformUtilsService.inSidebar($window);
         this.disableSearch = platformUtilsService.isEdge();
diff --git a/src/popup/app/global/main.controller.ts b/src/popup/app/global/main.controller.ts
index defeaed0f7..22ec60eaaa 100644
--- a/src/popup/app/global/main.controller.ts
+++ b/src/popup/app/global/main.controller.ts
@@ -1,3 +1,5 @@
+import AuthService from '../services/auth.service';
+
 import { UtilsService } from 'jslib/abstractions/utils.service';
 
 export class MainController implements ng.IController {
@@ -5,7 +7,7 @@ export class MainController implements ng.IController {
     xsBody: boolean;
     animation: string;
 
-    constructor($scope: any, $transitions: any, $state: any, authService: any, toastr: any,
+    constructor($scope: any, $transitions: any, $state: any, authService: AuthService, toastr: any,
         i18nService: any, $analytics: any, utilsService: UtilsService, $window: ng.IWindowService) {
         this.animation = '';
         this.xsBody = $window.screen.availHeight < 600;
diff --git a/src/popup/app/lock/lock.component.ts b/src/popup/app/lock/lock.component.ts
index b3fa7ede36..ca90e8bcfa 100644
--- a/src/popup/app/lock/lock.component.ts
+++ b/src/popup/app/lock/lock.component.ts
@@ -4,6 +4,7 @@ import * as template from './lock.component.html';
 import { CryptoService } from 'jslib/abstractions/crypto.service';
 import { MessagingService } from 'jslib/abstractions/messaging.service';
 import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
+import { UserService } from 'jslib/abstractions/user.service';
 
 export class LockController {
     i18n: any;
@@ -11,7 +12,7 @@ export class LockController {
 
     constructor(public $state: any, public i18nService: any, private $timeout: ng.ITimeoutService,
         private platformUtilsService: PlatformUtilsService,
-        public cryptoService: CryptoService, public toastr: any, public userService: any,
+        public cryptoService: CryptoService, public toastr: any, public userService: UserService,
         public messagingService: MessagingService, public SweetAlert: any) {
         this.i18n = i18nService;
     }