diff --git a/static/js/directives/ui/signup-form.js b/static/js/directives/ui/signup-form.js
index 4129d6af7..b9dcfeed1 100644
--- a/static/js/directives/ui/signup-form.js
+++ b/static/js/directives/ui/signup-form.js
@@ -38,7 +38,8 @@ angular.module('quay').directive('signupForm', function () {
           $scope.userRegistered({'username': $scope.newUser.username});
 
           if (!$scope.awaitingConfirmation && !$scope.inviteCode) {
-            document.location = '/';
+            $location.path("/");
+
           }
 
           UserService.load();
diff --git a/static/js/directives/ui/teams-manager.js b/static/js/directives/ui/teams-manager.js
index 88e926318..ba093b596 100644
--- a/static/js/directives/ui/teams-manager.js
+++ b/static/js/directives/ui/teams-manager.js
@@ -12,7 +12,7 @@ angular.module('quay').directive('teamsManager', function () {
       'organization': '=organization',
       'isEnabled': '=isEnabled'
     },
-    controller: function($scope, $element, ApiService, $timeout, UserService, TableService, UIService, Config, Features) {
+    controller: function($scope, $element, ApiService, $timeout, UserService, TableService, UIService, Config, Features, $location) {
       $scope.TableService = TableService;
       $scope.Config = Config;
       $scope.Features = Features;
@@ -151,7 +151,7 @@ angular.module('quay').directive('teamsManager', function () {
       };
 
       $scope.viewTeam = function(teamName) {
-        document.location = '/organization/' + $scope.organization.name + '/teams/' + teamName;
+        $location.path('/organization/' + $scope.organization.name + '/teams/' + teamName);
       };
 
       $scope.showMembers = function(value) {
diff --git a/static/js/pages/build-view.js b/static/js/pages/build-view.js
index b96d364c0..ad62c24e0 100644
--- a/static/js/pages/build-view.js
+++ b/static/js/pages/build-view.js
@@ -10,7 +10,7 @@
     });
   }]);
 
-  function BuildViewCtrl($scope, ApiService, $routeParams, AngularPollChannel, CookieService) {
+  function BuildViewCtrl($scope, ApiService, $routeParams, AngularPollChannel, CookieService, $location) {
     $scope.namespace = $routeParams.namespace;
     $scope.name = $routeParams.name;
     $scope.build_uuid = $routeParams.buildid;
@@ -51,8 +51,9 @@
             'build_uuid': build.id
           };
 
-          ApiService.cancelRepoBuild(null, params).then(function() {
-            document.location = '/repository/' + $scope.namespace + '/' + $scope.name;
+          ApiService.cancelRepoBuild(null, params).then(function () {
+            $location.path('/repository/' + $scope.namespace + '/' + $scope.name);
+
           }, ApiService.errorDisplay('Cannot cancel build'));
         }
       });
diff --git a/static/js/services/plan-service.js b/static/js/services/plan-service.js
index 1c8da7f5f..79d2a0a1b 100644
--- a/static/js/services/plan-service.js
+++ b/static/js/services/plan-service.js
@@ -2,9 +2,9 @@
  * Helper service for loading, changing and working with subscription plans.
  */
 angular.module('quay')
-       .factory('PlanService', ['KeyService', 'UserService', 'CookieService', 'ApiService', 'Features', 'Config',
+       .factory('PlanService', ['KeyService', 'UserService', 'CookieService', 'ApiService', 'Features', 'Config', '$location',
 
-function(KeyService, UserService, CookieService, ApiService, Features, Config) {
+function(KeyService, UserService, CookieService, ApiService, Features, Config, $location) {
   var plans = null;
   var planDict = {};
   var planService = {};
@@ -67,9 +67,9 @@ function(KeyService, UserService, CookieService, ApiService, Features, Config) {
 
       planService.getPlan(planId, function(plan) {
         if (planService.isOrgCompatible(plan)) {
-          document.location = '/organizations/new/?plan=' + planId;
+          $location.path('/organizations/new/?plan=' + planId);
         } else {
-          document.location = '/user?plan=' + planId;
+          $location.path('/user?plan=' + planId);
         }
       });
     });