diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2f7c32f3..d035a6e0 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,9 @@
+######
+3.1.5
+######
+- Make AuthTokenAdmin more compatible with big user tables
+- Extend docs regarding usage of Token Authentication as single authentication method.
+
 ######
 3.1.4
 ######
diff --git a/docs/changes.md b/docs/changes.md
index 3dd01428..90d961bc 100644
--- a/docs/changes.md
+++ b/docs/changes.md
@@ -1,5 +1,9 @@
 #Changelog
 
+## 3.1.5
+- Make AuthTokenAdmin more compatible with big user tables
+- Extend docs regarding usage of Token Authentication as single authentication method.
+
 ## 3.1.4
 - Fix compability with django-rest-swagger (bad inheritance)
 
diff --git a/knox/admin.py b/knox/admin.py
index 9a5ef182..45bbb07c 100644
--- a/knox/admin.py
+++ b/knox/admin.py
@@ -1,7 +1,9 @@
 from django.contrib import admin
 from knox import models
 
+
 @admin.register(models.AuthToken)
 class AuthTokenAdmin(admin.ModelAdmin):
     list_display = ('digest', 'user', 'created',)
     fields = ()
+    raw_id_fields = ('user',)
diff --git a/setup.py b/setup.py
index 82fe65b6..f65a090a 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='3.1.4',
+    version='3.1.5',
     description='Authentication for django rest framework',
     long_description=long_description,