diff --git a/src/background.js b/src/background.js
index 5bc8c38e17..6c76be7cbe 100644
--- a/src/background.js
+++ b/src/background.js
@@ -47,7 +47,8 @@ var bg_isBackground = true,
         bg_cryptoService, logout);
     bg_passwordGenerationService = new PasswordGenerationService(bg_constantsService, bg_utilsService, bg_cryptoService);
     bg_totpService = new TotpService(bg_constantsService);
-    bg_autofillService = new AutofillService(bg_utilsService, bg_totpService, bg_tokenService, bg_cipherService);
+    bg_autofillService = new AutofillService(bg_utilsService, bg_totpService, bg_tokenService, bg_cipherService,
+        bg_constantsService);
 
     if (chrome.commands) {
         chrome.commands.onCommand.addListener(function (command) {
diff --git a/src/services/autofillService.js b/src/services/autofillService.js
index 6c8aa8499d..fbccac88d3 100644
--- a/src/services/autofillService.js
+++ b/src/services/autofillService.js
@@ -1,8 +1,9 @@
-function AutofillService(utilsService, totpService, tokenService, cipherService) {
+function AutofillService(utilsService, totpService, tokenService, cipherService, constantsService) {
     this.utilsService = utilsService;
     this.totpService = totpService;
     this.tokenService = tokenService;
     this.cipherService = cipherService;
+    this.cipherService = cipherService;
 
     initAutofill();
 }
@@ -238,8 +239,9 @@ function initAutofill() {
                     fillScript: fillScript
                 }, { frameId: options.pageDetails[i].frameId });
 
-                if (totpPromise || (options.fromBackground && self.utilsService.isFirefox()) ||
-                    options.skipTotp || !options.cipher.login || !options.cipher.login.totp || !self.tokenService.getPremium()) {
+                if (options.cipher.type !== self.constantsService.cipherType.login || totpPromise ||
+                    (options.fromBackground && self.utilsService.isFirefox()) || options.skipTotp ||
+                    !options.cipher.login.totp || !self.tokenService.getPremium()) {
                     continue;
                 }