diff --git a/client/src/index.html b/client/src/index.html
index 2f3ba6f060..687659621a 100644
--- a/client/src/index.html
+++ b/client/src/index.html
@@ -59,10 +59,12 @@ <h4><a class="title-content">{{AppCtrl.projectName}}</a></h4>
 
         <div class="flex-footer" ng-cloak>
           <ul>
-            <li><a class="session" ng-click="AppCtrl.settings()">
-              <span class="glyphicon glyphicon-cog"></span>
-              <span class="link-label">User Settings</span>
-            </a></li>
+            <li>
+              <a class="session" ng-click="AppCtrl.settings()">
+                <span class="glyphicon glyphicon-cog"></span>
+                <span class="link-label">User Settings</span>
+              </a>
+            </li>
             <li>
               <a
                 id="expandnav"
diff --git a/client/src/js/app.js b/client/src/js/app.js
index b3664cced5..1db2d7386d 100644
--- a/client/src/js/app.js
+++ b/client/src/js/app.js
@@ -49,7 +49,7 @@ function bhimaConfig($stateProvider, $urlRouterProvider, $urlMatcherFactoryProvi
     templateUrl: 'partials/exchange/exchange.html'
   })
   .state('settings', {
-    url : '/settings',
+    url : '/settings?previous',
     controller: 'settings as SettingsCtrl',
     templateUrl: 'partials/settings/settings.html'
   })
diff --git a/client/src/partials/bhima/application.js b/client/src/partials/bhima/application.js
index 8005453637..2ffcd3da05 100644
--- a/client/src/partials/bhima/application.js
+++ b/client/src/partials/bhima/application.js
@@ -2,11 +2,11 @@ angular.module('bhima.controllers')
 .controller('ApplicationController', ApplicationController);
 
 ApplicationController.$inject = [
-  '$location', '$timeout', 'AppCache', 'appstate',
-  'connect', 'util', 'SessionService', 'LanguageService'
+  '$timeout', 'AppCache', 'appstate', 'connect', 'util',
+  'SessionService', 'LanguageService', '$state'
 ];
 
-function ApplicationController($location, $timeout, AppCache, appstate, connect, util, Session, Languages) {
+function ApplicationController($timeout, AppCache, appstate, connect, util, Session, Languages, $state) {
   var vm = this;
 
   // load in the application cache
@@ -130,6 +130,6 @@ function ApplicationController($location, $timeout, AppCache, appstate, connect,
   };
 
   vm.settings = function settings() {
-    $location.path('/settings');
+    $state.go('settings', { previous : $state.$current.name });
   };
 }
diff --git a/client/src/partials/settings/settings.html b/client/src/partials/settings/settings.html
index ae1bd93e3b..9e380d5bd2 100644
--- a/client/src/partials/settings/settings.html
+++ b/client/src/partials/settings/settings.html
@@ -30,17 +30,17 @@
           </select>
         </div>
 
+
+        <button ng-if="SettingsCtrl.previous" class="btn btn-default" ui-sref="{{ SettingsCtrl.previous }}">
+          <span class="glyphicon glyphicon-circle-arrow-left"></span> {{ "UTIL.BACK" | translate }}
+        </button>
+
         <button
           class="btn btn-default"
           ng-click="SettingsCtrl.logout()">
           <span class="glyphicon glyphicon-log-out"></span> {{ "SETTINGS.LOGOUT" | translate }}
         </button>
-
       </div>
     </div>
-
-    <button ng-if="!!SettingsCtrl.url" class="btn btn-sm btn-default" ng-click="SettingsCtrl.back()">
-      <span class="glyphicon glyphicon-circle-arrow-left"></span> {{ "UTIL.BACK" | translate }}
-    </button>
   </div>
 </div>
diff --git a/client/src/partials/settings/settings.js b/client/src/partials/settings/settings.js
index 811b9e9b9e..a688af3516 100644
--- a/client/src/partials/settings/settings.js
+++ b/client/src/partials/settings/settings.js
@@ -2,7 +2,7 @@ angular.module('bhima.controllers')
 .controller('settings', SettingsController);
 
 SettingsController.$inject = [
-  '$http', '$routeParams', '$location', 'LanguageService', 'SessionService'
+  '$state', 'LanguageService', 'SessionService'
 ];
 
 /**
@@ -10,30 +10,25 @@ SettingsController.$inject = [
  *
  * The settings page allows a user to control the local application settings,
  * such as display language.
+ *
+ * @constructor
  */
-function SettingsController($http, $routeParams, $location, Languages, Session) {
+function SettingsController($state, Languages, Session) {
   var vm = this;
 
   // the url to return to (using the back button)
-  vm.url = $routeParams.url || '';
+  vm.previous = $state.params.previous;
 
   // load settings from services
   vm.settings = { language : Languages.key };
 
+  // bind methods/services to the view
+  vm.languageService = Languages;
+  vm.logout = Session.logout;
+
   /** bind the language service for use in the view */
   Languages.read()
   .then(function (languages) {
     vm.languages = languages;
   });
-
-  vm.languageService = Languages;
-
-  /** returns a user to the previous url */
-  vm.back = back;
-
-  function back() {
-    $location.url(vm.url);
-  }
-
-  vm.logout = Session.logout;
 }