diff --git a/src/content/notificationBar.js b/src/content/notificationBar.js
index e4a71c6fb1..7f83cc343c 100644
--- a/src/content/notificationBar.js
+++ b/src/content/notificationBar.js
@@ -5,7 +5,8 @@
         pageHref = null,
         observer = null,
         domObservationCollectTimeout = null,
-        iframed = isIframed();
+        iframed = isIframed(),
+        submitButtonNames = ['log in', 'sign in', 'login', 'go', 'submit', 'continue'];
 
     if (window.location.hostname.indexOf('bitwarden.com') === -1) {
         chrome.storage.local.get('neverDomains', function (obj) {
@@ -79,7 +80,18 @@
                     }
 
                     for (var j = 0; j < mutations[i].addedNodes.length; j++) {
-                        if (!mutations[i].addedNodes[j]) {
+                        var addedNode = mutations[i].addedNodes[j];
+                        if (!addedNode) {
+                            continue;
+                        }
+
+                        if (addedNode.tagName && addedNode.tagName.toLowerCase() == 'form' &&
+                            (!addedNode.dataset || !addedNode.dataset.bitwardenWatching)) {
+                            doCollect = true;
+                            break;
+                        }
+
+                        if (!addedNode.querySelectorAll) {
                             continue;
                         }
 
@@ -164,11 +176,39 @@
     function listen(form) {
         form.removeEventListener('submit', formSubmitted, false);
         form.addEventListener('submit', formSubmitted, false);
-        var submitButton = form.querySelector('input[type="submit"], button[type="submit"]');
+        var submitButton = form.querySelector(
+            'input[type="submit"], input[type="image"], button[type="submit"], button:not([type])');
         if (submitButton) {
             submitButton.removeEventListener('click', formSubmitted, false);
             submitButton.addEventListener('click', formSubmitted, false);
         }
+        else {
+            var possibleSubmitButtons = form.querySelectorAll('a, span, button[type="button"], input[type="button"]');
+            for (var i = 0; i < possibleSubmitButtons.length; i++) {
+                var button = possibleSubmitButtons[i];
+                if (!button || !button.tagName) {
+                    continue;
+                }
+
+                var buttonText;
+                if (button.tagName.toLowerCase() === 'input') {
+                    buttonText = button.value;
+                }
+                else {
+                    buttonText = button.innerText;
+                }
+
+                if (!buttonText) {
+                    continue;
+                }
+
+                buttonText = buttonText.trim().toLowerCase();
+                if (submitButtonNames.indexOf(buttonText) > -1) {
+                    button.removeEventListener('click', formSubmitted, false);
+                    button.addEventListener('click', formSubmitted, false);
+                }
+            }
+        }
     }
 
     function locateFields(formDataObj) {