diff --git a/core/misc/form.js b/core/misc/form.js
index f1578bd..8fe3615 100644
--- a/core/misc/form.js
+++ b/core/misc/form.js
@@ -196,26 +196,24 @@
   Drupal.behaviors.fillUserInfoFromBrowser = {
     attach: function (context, settings) {
       var userInfo = ['name', 'mail', 'homepage'];
-      $('form.user-info-from-browser').once('user-info-from-browser', function () {
-        var $formContext = $(this);
-        var i, il, $element, browserData;
-        for (i = 0, il = userInfo.length; i < il; i += 1) {
-          $element = $formContext.find('[name=' + userInfo[i] + ']');
-          browserData = localStorage.getItem('Drupal.visitor.' + userInfo[i]);
-          if ($element.length && browserData) {
-            $element.val(browserData);
+      var $forms = $('form.user-info-from-browser').once('user-info-from-browser');
+      if ($forms.length) {
+        var $browserData;
+        userInfo.map(function (info) {
+          var $element = $forms.find('[name=' + info + ']');
+          $browserData = localStorage.getItem('Drupal.visitor.' + info);
+          if ($element.length && $browserData) {
+            $element.val($browserData);
           }
-        }
-      });
-      $('form.user-info-from-browser').submit(function () {
-        var $formContext = $(this);
-        var i, il, $element;
-        for (i = 0, il = userInfo.length; i < il; i += 1) {
-          $element = $formContext.find('[name=' + userInfo[i] + ']');
+        });
+      }
+      $forms.on('submit', function () {
+        userInfo.map(function (info) {
+          var $element = $forms.find('[name=' + info + ']');
           if ($element.length) {
-            localStorage.setItem('Drupal.visitor.' + userInfo[i], $element.val());
+            localStorage.setItem('Drupal.visitor.' + info, $element.val());
           }
-        }
+        });
       });
     }
   };