diff --git a/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee b/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee
index 1160535b0b..7c5711d992 100644
--- a/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee
@@ -21,6 +21,9 @@ angular.module('Darkswarm').factory "AuthenticationService", (Navigation, $modal
       @selectedPath = path || @selectedPath
       Navigation.navigate @selectedPath
 
+      if window._paq
+        window._paq.push(['trackEvent', 'Signin/Signup', 'Login Modal View', window.location.href])
+
     # Opens the /login tab if returning from email confirmation,
     # the /signup tab if opened from the enterprise registration page,
     # otherwise opens whichever tab is selected in the URL params ('/login', '/signup', or '/forgot')
diff --git a/app/assets/javascripts/templates/login.html.haml b/app/assets/javascripts/templates/login.html.haml
index cf92fa0f7c..7ca17bfbe9 100644
--- a/app/assets/javascripts/templates/login.html.haml
+++ b/app/assets/javascripts/templates/login.html.haml
@@ -42,7 +42,3 @@
           tabindex: "4",
           type: "submit",
           value: "{{'label_login' | t}}"}
-:javascript
-  if (window._paq) {
-    window._paq.push(['trackEvent', 'Signin/Signup', 'Login Modal View', window.location.href]);
-  }