diff --git a/Gemfile b/Gemfile
index fb67f301f72bc76f0d1828b57d996687e536356f..a5ac9acc8b28f3ff7e0c4996c9ff544040628490 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,6 +16,7 @@ gem "pg", group: :postgres
 
 # Auth
 gem "devise", '~> 2.2'
+gem "devise-async"
 gem 'omniauth', "~> 1.1.3"
 gem 'omniauth-google-oauth2'
 gem 'omniauth-twitter'
diff --git a/Gemfile.lock b/Gemfile.lock
index ce3aeb7994b11caacd945685a478c6a0221d340a..667ea9f129934faf3722cd75f5d5cc970bcb889b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -106,6 +106,8 @@ GEM
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
+    devise-async (0.8.0)
+      devise (>= 2.2, < 3.2)
     diff-lcs (1.2.4)
     dotenv (0.8.0)
     email_spec (1.4.0)
@@ -564,6 +566,7 @@ DEPENDENCIES
   d3_rails (~> 3.1.4)
   database_cleaner
   devise (~> 2.2)
+  devise-async
   email_spec
   enumerize
   factory_girl_rails
diff --git a/app/models/user.rb b/app/models/user.rb
index 5d742578c42552460a0890681b0d39c3baa65fdd..4d46efe42dec22e13c4fb1b767c5bb613b65c9f0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -42,8 +42,8 @@ require 'carrierwave/orm/activerecord'
 require 'file_size_validator'
 
 class User < ActiveRecord::Base
-  devise :database_authenticatable, :token_authenticatable, :lockable,
-         :recoverable, :rememberable, :trackable, :validatable, :omniauthable, :registerable
+  devise :database_authenticatable, :token_authenticatable, :lockable, :async,
+         :recoverable, :rememberable, :trackable, :validatable, :omniauthable
 
   attr_accessible :email, :password, :password_confirmation, :remember_me, :bio, :name, :username,
                   :skype, :linkedin, :twitter, :color_scheme_id, :theme_id, :force_random_password,
diff --git a/config/initializers/devise_async.rb b/config/initializers/devise_async.rb
new file mode 100644
index 0000000000000000000000000000000000000000..05a1852cdbd9d141a757755983adc59ad467f3ca
--- /dev/null
+++ b/config/initializers/devise_async.rb
@@ -0,0 +1 @@
+Devise::Async.backend = :sidekiq