diff --git a/app/assets/javascripts/darkswarm/controllers/authentication_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/authentication_controller.js.coffee
index be960145af..7c45fd53d1 100644
--- a/app/assets/javascripts/darkswarm/controllers/authentication_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/authentication_controller.js.coffee
@@ -1,5 +1,6 @@
 Darkswarm.controller "AuthenticationCtrl", ($scope, AuthenticationService, SpreeUser)->
   $scope.open = AuthenticationService.open
+  $scope.toggle = AuthenticationService.toggle
   
   $scope.spree_user = SpreeUser.spree_user
   $scope.active = AuthenticationService.active
diff --git a/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee b/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee
index cdcb21c027..44a0819b7a 100644
--- a/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee
@@ -1,16 +1,19 @@
 Darkswarm.factory "AuthenticationService", (Navigation, $modal, $location)->
   new class AuthenticationService
     selectedPath: "/login"
+
     constructor: ->
       if $location.path() in ["/login", "/signup", "/forgot"] 
         @open()
-    open: =>
+
+    open: (path = false)=>
       @modalInstance = $modal.open
         templateUrl: 'authentication.html'
-
       @modalInstance.result.then @close, @close
+      @selectedPath = path || @selectedPath
       Navigation.navigate @selectedPath
 
+
     select: (path)=>
       @selectedPath = path
       Navigation.navigate @selectedPath
diff --git a/app/assets/javascripts/darkswarm/services/navigation.js.coffee b/app/assets/javascripts/darkswarm/services/navigation.js.coffee
index 25a4ce577b..cf64cd1666 100644
--- a/app/assets/javascripts/darkswarm/services/navigation.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/navigation.js.coffee
@@ -5,11 +5,12 @@ Darkswarm.factory 'Navigation', ($location) ->
     active: (path)->
       $location.path() == path 
 
-    navigate: (path)->
+    navigate: (path)=>
       @path = path
       $location.path(@path)
 
-    toggle: (path = false)->
+    toggle: (path = false)=>
+      console.log "toggling"
       @path = path || @path
       if $location.path() == @path
         $location.path("/")
diff --git a/app/views/checkout/_authentication.html.haml b/app/views/checkout/_authentication.html.haml
index 891958de25..13eee42b9f 100644
--- a/app/views/checkout/_authentication.html.haml
+++ b/app/views/checkout/_authentication.html.haml
@@ -1,9 +1,9 @@
 %fieldset
   %accordion-group{heading: "User", "is-open" => "accordion.user"}
     .row
-      .large-4.columns.text-center{"ng-controller" => "AuthenticationActionsCtrl"}
-        %button{"ng-click" => "toggle('/login')"} Login
-      .large-4.columns.text-center{"ng-controller" => "AuthenticationActionsCtrl"}
-        %button{"ng-click" => "toggle('/signup')"} Signup
+      .large-4.columns.text-center{"ng-controller" => "AuthenticationCtrl"}
+        %button{"ng-click" => "open('/login')"} Login
+      .large-4.columns.text-center{"ng-controller" => "AuthenticationCtrl"}
+        %button{"ng-click" => "open('/signup')"} Signup
       .large-4.columns.text-center
         %button{"ng-click" => "show('details')"} Checkout as guest