diff --git a/HISTORY.rst b/HISTORY.rst
index 1363449538..4c84fc4267 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -14,6 +14,7 @@
 - Fix cabinets permission and access control checking.
 - The permission to add or remove documents to cabinets now applies to documents too.
 - Equalize dashboard widgets heights.
+- Switch the order of the DEFAULT_AUTHENTICATION_CLASSES of DRF. GitLab #400.
 
 2.5.2 (2017-07-08)
 ==================
diff --git a/mayan/settings/base.py b/mayan/settings/base.py
index 9ffd843215..349a23fa0a 100644
--- a/mayan/settings/base.py
+++ b/mayan/settings/base.py
@@ -256,9 +256,9 @@ INTERNAL_IPS = ('127.0.0.1',)
 # ---------- Django REST framework -----------
 REST_FRAMEWORK = {
     'DEFAULT_AUTHENTICATION_CLASSES': (
-        'rest_framework.authentication.BasicAuthentication',
-        'rest_framework.authentication.TokenAuthentication',
         'rest_framework.authentication.SessionAuthentication',
+        'rest_framework.authentication.TokenAuthentication',
+        'rest_framework.authentication.BasicAuthentication',
     ),
     'PAGE_SIZE': 10,
 }