diff --git a/app/assets/javascripts/jsxc.js b/app/assets/javascripts/jsxc.js
index 9209fd7bf..9e90634ca 100644
--- a/app/assets/javascripts/jsxc.js
+++ b/app/assets/javascripts/jsxc.js
@@ -12,7 +12,7 @@
 // initialize jsxc xmpp client
 $(document).ready(function() {
   if (app.currentUser.authenticated()) {
-    $.post('api/v1/tokens', null, function(data) {
+    $.post("/user/auth_token", null, function(data) {
       if (jsxc && data['token']) {
         var jid = app.currentUser.get('diaspora_id');
         jsxc.init({
diff --git a/app/controllers/api/v1/tokens_controller.rb b/app/controllers/api/v1/tokens_controller.rb
deleted file mode 100644
index f59c2eac5..000000000
--- a/app/controllers/api/v1/tokens_controller.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class Api::V1::TokensController < ApplicationController
-  skip_before_filter :verify_authenticity_token
-  before_filter :authenticate_user!
-
-  respond_to :json
-
-  def create
-    current_user.ensure_authentication_token!
-    render :status => 200, :json => { :token => current_user.authentication_token }
-  end
-  
-  def destroy
-    current_user.reset_authentication_token!
-    render :json => true, :status => 200
-  end
-end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8e01dff62..958353e28 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -128,6 +128,11 @@ class UsersController < ApplicationController
     redirect_to edit_user_path
   end
 
+  def auth_token
+    current_user.ensure_authentication_token!
+    render status: 200, json: {token: current_user.authentication_token}
+  end
+
   private
 
   # rubocop:disable Metrics/MethodLength
diff --git a/config/routes.rb b/config/routes.rb
index 4e7b9d498..02b15089c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -106,6 +106,7 @@ Diaspora::Application.routes.draw do
     get :download_profile
     post :export_photos
     get :download_photos
+    post :auth_token
   end
 
   controller :users do
@@ -184,12 +185,6 @@ Diaspora::Application.routes.draw do
     end
   end
 
-  namespace :api do
-    namespace :v1 do
-      resources :tokens, :only => [:create, :destroy]
-    end
-  end
-
   get 'community_spotlight' => "contacts#spotlight", :as => 'community_spotlight'
   # Mobile site