diff --git a/sites/all/modules/persistent_login/persistent_login.module b/sites/all/modules/persistent_login/persistent_login.module
index 43c3c2b..c1a5f12 100755
--- a/sites/all/modules/persistent_login/persistent_login.module
+++ b/sites/all/modules/persistent_login/persistent_login.module
@@ -115,7 +115,11 @@ function persistent_login_form_alter(&$form, $form_state, $form_id) {
     // - Visitors can create accounts and no administrator approval is required.
     // - E-mail verification is not required when a visitor creates an account.
     // - The form is not being executed by a user administrator.
-    if (!variable_get('user_email_verification', 1) && variable_get('user_register', 1) == 1 && !user_access('administer users')) {
+    // - Logintoboggan is not enabled or is enabled and user will be logged in immediately upon registration
+    if (!module_exists('logintoboggan') && !variable_get('user_email_verification', 1) && variable_get('user_register', 1) == 1 && !user_access('administer users')) {
+      $alter_form = TRUE;
+    }
+    elseif (module_exists('logintoboggan') && variable_get('logintoboggan_immediate_login_on_register', FALSE)) {
       $alter_form = TRUE;
     }
   }