diff --git a/src/app/features/account/apiKeysCtrl.js b/src/app/features/account/apiKeysCtrl.js
index 64df055dd90..f4ec0d681e8 100644
--- a/src/app/features/account/apiKeysCtrl.js
+++ b/src/app/features/account/apiKeysCtrl.js
@@ -16,17 +16,17 @@ function (angular) {
     };
 
     $scope.getTokens = function() {
-      backendSrv.get('/api/tokens').then(function(tokens) {
+      backendSrv.get('/api/auth/keys').then(function(tokens) {
         $scope.tokens = tokens;
       });
     };
 
     $scope.removeToken = function(id) {
-      backendSrv.delete('/api/tokens/'+id).then($scope.getTokens);
+      backendSrv.delete('/api/auth/keys/'+id).then($scope.getTokens);
     };
 
     $scope.addToken = function() {
-      backendSrv.post('/api/tokens', $scope.token).then($scope.getTokens);
+      backendSrv.post('/api/auth/keys', $scope.token).then($scope.getTokens);
     };
 
     $scope.init();
diff --git a/src/app/features/account/partials/apikeys.html b/src/app/features/account/partials/apikeys.html
index 489cd85c743..612a29b9a79 100644
--- a/src/app/features/account/partials/apikeys.html
+++ b/src/app/features/account/partials/apikeys.html
@@ -39,7 +39,7 @@
 					<tr ng-repeat="t in tokens">
 						<td>{{t.name}}</td>
 						<td>{{t.role}}</td>
-						<td>{{t.token}}</td>
+						<td>{{t.key}}</td>
 						<td style="width: 1%">
 							<a ng-click="removeToken(t.id)" class="btn btn-danger btn-mini">
 								<i class="fa fa-remove"></i>