diff --git a/js/login_return_page.js b/js/login_return_page.js
index dfe3f57..1c3c2a8 100644
--- a/js/login_return_page.js
+++ b/js/login_return_page.js
@@ -4,10 +4,14 @@
 
   Drupal.behaviors.linkReturnPage = {
     attach: function (context) {
-      var current_page = location.pathname;
-      $(context).find("a[href='/user/login']").once('login-processed-link').each(function () {
-        $(this).attr('href', $(this).attr('href') + '?destination=' + current_page);
-      });
+      var current_page = location.pathname,
+        login_page = '/user/login';
+
+      if (login_page != current_page) {
+        $(context).find("a[href='" + login_page + "']").once('login-processed-link').each(function () {
+          $(this).attr('href', $(this).attr('href') + '?destination=' + current_page);
+        });
+      }
     }
   }
 })(jQuery, Drupal);
diff --git a/login_return_page.libraries.yml b/login_return_page.libraries.yml
index bb2ad5b..d2d4c0c 100644
--- a/login_return_page.libraries.yml
+++ b/login_return_page.libraries.yml
@@ -3,5 +3,6 @@ login-return-page-link:
   js:
     js/login_return_page.js: {}
   dependencies:
+    - core/drupal
     - core/jquery
     - core/jquery.once