diff --git a/logintoboggan.unifiedlogin.js b/logintoboggan.unifiedlogin.js
index c788b86c04d98abea3c6ba3d7c26ea796ac073ee..d8980f95167ab31a99f5c844c53441829af1e055 100644
--- a/logintoboggan.unifiedlogin.js
+++ b/logintoboggan.unifiedlogin.js
@@ -3,13 +3,13 @@
 
 Drupal.behaviors.unifiedLogin = {
 
-  attach: function (context) {
+  attach: function (context, settings) {
     // Attach behaviors to the links so that they show/hide forms appropriately.
-    $('.toboggan-unified #register-link').click(function() {
+    $('.toboggan-unified #register-link', context).click(function() {
       $(this).addClass('lt-active').blur();
-      $('.toboggan-unified #login-link').removeClass('lt-active');
-      $('.toboggan-unified #register-form').show();
-      $('.toboggan-unified #login-form').hide();
+      $('.toboggan-unified #login-link', context).removeClass('lt-active');
+      $('.toboggan-unified #register-form', context).show();
+      $('.toboggan-unified #login-form', context).hide();
       $.ajax({
         url: "/user/register",
         success: function(data) {
@@ -20,11 +20,11 @@ Drupal.behaviors.unifiedLogin = {
       });
       return false;
     });
-    $('.toboggan-unified #login-link').click(function() {
+    $('.toboggan-unified #login-link', context).click(function () {
       $(this).addClass('lt-active').blur();
-      $('.toboggan-unified #register-link').removeClass('lt-active');
-      $('.toboggan-unified #login-form').show();
-      $('.toboggan-unified #register-form').hide();
+      $('.toboggan-unified #register-link', context).removeClass('lt-active');
+      $('.toboggan-unified #login-form', context).show();
+      $('.toboggan-unified #register-form', context).hide();
       $.ajax({
         url: "/user/login",
         success: function(data) {
@@ -36,13 +36,13 @@ Drupal.behaviors.unifiedLogin = {
       return false;
     });
 
-    switch(Drupal.settings.LoginToboggan.unifiedLoginActiveForm) {
+    switch(settings.LoginToboggan.unifiedLoginActiveForm) {
       case 'register':
-        $('.toboggan-unified #register-link').click();
+        $('.toboggan-unified #register-link', context).click();
         break;
       case 'login':
       default:
-        $('.toboggan-unified #login-link').click();
+        $('.toboggan-unified #login-link', context).click();
         break;
     }
   }