diff --git a/src/main/webapp/components/header.html b/src/main/webapp/components/header.html
index 84059441f..9e3cbfd56 100644
--- a/src/main/webapp/components/header.html
+++ b/src/main/webapp/components/header.html
@@ -2,7 +2,7 @@
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">
-      <a class="navbar-brand" href="/petclinic/" data-ng-click="goHome()">
+      <a class="navbar-brand" data-ng-href="{{context}}" data-ng-click="goHome()">
         <img alt="Pet Clinic Brand" height="27" width="auto" src="images/logo.png">
       </a>
       <button class="navbar-toggle navbar-toggle-left collapsed" type="button" data-toggle="collapse" data-target="#nav-menu">
diff --git a/src/main/webapp/components/main/MainController.js b/src/main/webapp/components/main/MainController.js
index 1e34811a9..961cc2eca 100644
--- a/src/main/webapp/components/main/MainController.js
+++ b/src/main/webapp/components/main/MainController.js
@@ -1,4 +1,4 @@
-var MainController =  ['$scope','$rootScope','$state','$sessionStorage', function($scope, $rootScope, $state, $sessionStorage) {
+var MainController =  ['$scope','$rootScope','$state','$sessionStorage', 'context', function($scope, $rootScope, $state, $sessionStorage, context) {
 	
 	$scope.$storage = $sessionStorage;
 	
@@ -46,6 +46,8 @@ var MainController =  ['$scope','$rootScope','$state','$sessionStorage', functio
 		'font' : 'fa fa-question'
 	} ];
 	
+	$scope.context = context;
+	
 	$scope.footerText = '© ' + new Date().getFullYear() + ' Pet Clinic, A Spring Framework Demonstration';
 	
 	$rootScope.$state = $state;
diff --git a/src/main/webapp/services/services.js b/src/main/webapp/services/services.js
index 290827e2a..5368f3af5 100644
--- a/src/main/webapp/services/services.js
+++ b/src/main/webapp/services/services.js
@@ -1,21 +1,21 @@
-var Owner = ['$resource', function($resource) {
-	return $resource('/petclinic/api/owners/:id');
+var Owner = ['$resource','context', function($resource, context) {
+	return $resource(context + '/api/owners/:id');
 }];
 
-var OwnerPet = ['$resource', function($resource) {
-	return $resource('/petclinic/api/owners/:ownerId/pets', {ownerId : '@ownerId'});
+var OwnerPet = ['$resource','context', function($resource, context) {
+	return $resource(context + '/api/owners/:ownerId/pets', {ownerId : '@ownerId'});
 }];
 
-var Pet = ['$resource', function($resource) {
-	return $resource('/petclinic/api/pets/:id');
+var Pet = ['$resource','context', function($resource, context) {
+	return $resource(context + '/api/pets/:id');
 }];
 
-var Vet = ['$resource', function($resource) {
-	return $resource('/petclinic/api/vets/:vetId');
+var Vet = ['$resource','context', function($resource, context) {
+	return $resource(context + '/api/vets/:vetId');
 }];
 
-var Visit = ['$resource', function($resource) {
-	return $resource('/petclinic/api/pets/:petId/visits', {petId : '@id'});
+var Visit = ['$resource','context', function($resource, context) {
+	return $resource(context + '/api/pets/:petId/visits', {petId : '@id'});
 }];
 
 var MockService = ['$httpBackend', '$http', 'context', function($httpBackend, $http, context) {