diff --git a/webadmin/src/views/tokens.js b/webadmin/src/views/tokens.js
index 9d6d9f3ee..1d29db9be 100644
--- a/webadmin/src/views/tokens.js
+++ b/webadmin/src/views/tokens.js
@@ -33,7 +33,7 @@ angular.module('Application').controller('TokensController', ['$scope', 'Client'
             $scope.clientAdd.busy = true;
             $scope.clientAdd.error = {};
 
-            var CLIENT_REDIRECT_URI_FALLBACK = Client.apiOrigin;
+            var CLIENT_REDIRECT_URI_FALLBACK = Client.apiOrigin || location.origin;
 
             Client.createOAuthClient($scope.clientAdd.name, $scope.clientAdd.scope, $scope.clientAdd.redirectURI || CLIENT_REDIRECT_URI_FALLBACK, function (error) {
                 $scope.clientAdd.busy = false;