diff --git a/app/assets/javascripts/darkswarm/controllers/authentication/forgot_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/authentication/forgot_controller.js.coffee
index 85d2a699a3..85920de958 100644
--- a/app/assets/javascripts/darkswarm/controllers/authentication/forgot_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/authentication/forgot_controller.js.coffee
@@ -1,6 +1,5 @@
 Darkswarm.controller "ForgotCtrl", ($scope, $http, $location, AuthenticationService) ->
   $scope.path = "/forgot"
-  $scope.active = $scope.isActive($scope.path)
   $scope.sent = false
 
   $scope.submit = ->
diff --git a/app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee
index 07bef90f84..f91e137ca7 100644
--- a/app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee
@@ -1,6 +1,5 @@
 Darkswarm.controller "LoginCtrl", ($scope, $http, $window, AuthenticationService, Redirections, Loading) ->
   $scope.path = "/login"
-  $scope.active = $scope.isActive($scope.path)
 
   $scope.submit = ->
     Loading.message = t 'logging_in'
diff --git a/app/assets/javascripts/darkswarm/controllers/authentication/signup_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/authentication/signup_controller.js.coffee
index dfa61f82b2..722414f9d4 100644
--- a/app/assets/javascripts/darkswarm/controllers/authentication/signup_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/authentication/signup_controller.js.coffee
@@ -1,6 +1,5 @@
 Darkswarm.controller "SignupCtrl", ($scope, $http, $window, $location, Redirections, AuthenticationService) ->
   $scope.path = "/signup"
-  $scope.active = $scope.isActive($scope.path)
 
   $scope.errors =
     email: null
diff --git a/app/assets/javascripts/darkswarm/controllers/authentication_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/authentication_controller.js.coffee
index 7d65b853c7..135fe37b89 100644
--- a/app/assets/javascripts/darkswarm/controllers/authentication_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/authentication_controller.js.coffee
@@ -5,3 +5,8 @@ Darkswarm.controller "AuthenticationCtrl", ($scope, AuthenticationService, Spree
   $scope.spree_user = SpreeUser.spree_user
   $scope.isActive = AuthenticationService.isActive
   $scope.select = AuthenticationService.select
+
+  $scope.tabs =
+    login: { active: $scope.isActive('/login') }
+    signup: { active: $scope.isActive('/signup') }
+    forgot: { active: $scope.isActive('/forgot') }
diff --git a/app/assets/javascripts/templates/forgot.html.haml b/app/assets/javascripts/templates/forgot.html.haml
index 3e88350321..958f1daa39 100644
--- a/app/assets/javascripts/templates/forgot.html.haml
+++ b/app/assets/javascripts/templates/forgot.html.haml
@@ -1,4 +1,4 @@
-%tab#forgot{ heading: "{{'forgot_password' | t}}", active: "active", select: "select(path)"}
+%tab#forgot{ heading: "{{'forgot_password' | t}}", active: "tabs.forgot.active", select: "select(path)"}
   %form{ ng: { controller: "ForgotCtrl", submit: "submit()" } }
     .row
       .large-12.columns
diff --git a/app/assets/javascripts/templates/login.html.haml b/app/assets/javascripts/templates/login.html.haml
index 8b3e64cfb1..79511d8968 100644
--- a/app/assets/javascripts/templates/login.html.haml
+++ b/app/assets/javascripts/templates/login.html.haml
@@ -1,4 +1,4 @@
-%tab#login-content{ heading: "{{'label_login' | t}}", active: "active", select: "select(path)"}
+%tab#login-content{ heading: "{{'label_login' | t}}", active: "tabs.login.active", select: "select(path)"}
   %form{ ng: { controller: "LoginCtrl", submit: "submit()" } }
     .row
       .large-12.columns
diff --git a/app/assets/javascripts/templates/signup.html.haml b/app/assets/javascripts/templates/signup.html.haml
index 1c13985f38..23eab8e38c 100644
--- a/app/assets/javascripts/templates/signup.html.haml
+++ b/app/assets/javascripts/templates/signup.html.haml
@@ -1,4 +1,4 @@
-%tab#sign-up-content{ heading: "{{'label_signup' | t}}", active: 'active', select: "select(path)"}
+%tab#sign-up-content{ heading: "{{'label_signup' | t}}", active: 'tabs.signup.active', select: "select(path)"}
   %form{ ng: { controller: "SignupCtrl", submit: "submit()" } }
     .row
       .large-12.columns