diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/devise/confirmations_controller.rb
similarity index 94%
rename from app/controllers/confirmations_controller.rb
rename to app/controllers/devise/confirmations_controller.rb
index 863d4cdcd..97b6d223d 100644
--- a/app/controllers/confirmations_controller.rb
+++ b/app/controllers/devise/confirmations_controller.rb
@@ -1,4 +1,4 @@
-class ConfirmationsController < Devise::ConfirmationsController
+class Devise::ConfirmationsController < Devise::ConfirmationsController
   skip_before_action :require_no_authentication, raise: false
   skip_before_action :authenticate_user!, raise: false
 
diff --git a/app/controllers/passwords_controller.rb b/app/controllers/devise/passwords_controller.rb
similarity index 96%
rename from app/controllers/passwords_controller.rb
rename to app/controllers/devise/passwords_controller.rb
index 873da9d3f..cd1977647 100644
--- a/app/controllers/passwords_controller.rb
+++ b/app/controllers/devise/passwords_controller.rb
@@ -1,4 +1,4 @@
-class PasswordsController < Devise::PasswordsController
+class Devise::PasswordsController < Devise::PasswordsController
   include AuthHelper
 
   skip_before_action :require_no_authentication, raise: false
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/devise/sessions_controller.rb
similarity index 61%
rename from app/controllers/sessions_controller.rb
rename to app/controllers/devise/sessions_controller.rb
index 582406b4c..f2497de28 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/devise/sessions_controller.rb
@@ -1,4 +1,4 @@
-class SessionsController < ::DeviseTokenAuth::SessionsController
+class Devise::SessionsController < ::DeviseTokenAuth::SessionsController
   # Prevent session parameter from being passed
   # Unpermitted parameter: session
   wrap_parameters format: []
diff --git a/app/controllers/devise/token_validations_controller.rb b/app/controllers/devise/token_validations_controller.rb
new file mode 100644
index 000000000..bd3d4bea3
--- /dev/null
+++ b/app/controllers/devise/token_validations_controller.rb
@@ -0,0 +1,10 @@
+class Devise::TokenValidationsController < ::DeviseTokenAuth::TokenValidationsController
+  def validate_token
+    # @resource will have been set by set_user_by_token concern
+    if @resource
+      render 'devise/token.json'
+    else
+      render_validate_token_error
+    end
+  end
+end
diff --git a/app/views/devise/token.json.jbuilder b/app/views/devise/token.json.jbuilder
new file mode 100644
index 000000000..78cd44235
--- /dev/null
+++ b/app/views/devise/token.json.jbuilder
@@ -0,0 +1,17 @@
+json.payload do
+  json.success true
+  json.data do
+    json.id @resource.id
+    json.provider @resource.provider
+    json.uid @resource.uid
+    json.name @resource.name
+    json.nickname @resource.nickname
+    json.email @resource.email
+    json.account_id @resource.account_id
+    json.pubsub_token @resource.pubsub_token
+    json.role @resource.role
+    json.inviter_id @resource.inviter_id
+    json.confirmed @resource.confirmed?
+    json.avatar_url @resource.avatar_url
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index c2655283a..be73c62e7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,8 +1,9 @@
 Rails.application.routes.draw do
   # AUTH STARTS
   match 'auth/:provider/callback', to: 'home#callback', via: [:get, :post]
-  mount_devise_token_auth_for 'User', at: 'auth', controllers: { confirmations: 'confirmations', passwords: 'passwords',
-                                                                 sessions: 'sessions' }, via: [:get, :post]
+  mount_devise_token_auth_for 'User', at: 'auth', controllers: { confirmations: 'devise/confirmations', passwords: 'devise/passwords',
+                                                                 sessions: 'devise/sessions',
+                                                                 token_validations: 'devise/token_validations' }, via: [:get, :post]
 
   root to: 'dashboard#index'
 
diff --git a/spec/controllers/devise/token_validations_controller_spec.rb b/spec/controllers/devise/token_validations_controller_spec.rb
new file mode 100644
index 000000000..5a9891a0f
--- /dev/null
+++ b/spec/controllers/devise/token_validations_controller_spec.rb
@@ -0,0 +1,26 @@
+require 'rails_helper'
+
+RSpec.describe 'Token Validation API', type: :request do
+  describe 'GET /validate_token' do
+    let(:account) { create(:account) }
+
+    context 'when it is an invalid token' do
+      it 'returns unauthorized' do
+        get '/auth/validate_token'
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is a valid token' do
+      let(:agent) { create(:user, account: account, role: :agent) }
+
+      it 'returns all the labels for the conversation' do
+        get '/auth/validate_token',
+            headers: agent.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+        expect(response.body).to include('payload')
+      end
+    end
+  end
+end