diff --git a/src/background.js b/src/background.js
index 9842e60b1f..89bb411464 100644
--- a/src/background.js
+++ b/src/background.js
@@ -123,7 +123,7 @@ var bg_isBackground = true,
             else if (msg.sender === 'autofiller' || msg.sender === 'autofill_cmd') {
                 bg_autofillService.doAutoFillForLastUsedLogin([{
                     frameId: sender.frameId, tab: msg.tab, details: msg.details
-                }]);
+                }], msg.sender === 'autofill_cmd');
             }
             else {
                 clearTimeout(autofillTimeout);
diff --git a/src/services/autofillService.js b/src/services/autofillService.js
index 2f48a11aed..1008421a70 100644
--- a/src/services/autofillService.js
+++ b/src/services/autofillService.js
@@ -276,7 +276,7 @@ function initAutofill() {
         return deferred.promise;
     };
 
-    AutofillService.prototype.doAutoFillForLastUsedLogin = function (pageDetails) {
+    AutofillService.prototype.doAutoFillForLastUsedLogin = function (pageDetails, fromCommand) {
         var self = this;
 
         chrome.tabs.query({ active: true, currentWindow: true }, function (tabs) {
@@ -305,7 +305,7 @@ function initAutofill() {
                     fromBackground: true,
                     skipTotp: true,
                     skipLastUsed: true,
-                    skipUsernameOnlyFill: true
+                    skipUsernameOnlyFill: !fromCommand
                 });
             });
         });