diff --git a/demo/setup.py b/demo/setup.py
index 16eb5897..f03dadb9 100644
--- a/demo/setup.py
+++ b/demo/setup.py
@@ -22,7 +22,8 @@ CLASSIFIERS = ['Development Status :: 4 - Beta',
                'Programming Language :: Python :: 3.5',
                'Programming Language :: Python :: 3.6',
                'Programming Language :: Python :: 3.7',
-               'Framework :: Django :: 2.0']
+               'Framework :: Django :: 2.0',
+               'Framework :: Django :: 2.1']
 KEYWORDS = []
 PACKAGES = ['demodesk']
 REQUIREMENTS = [
diff --git a/helpdesk/urls.py b/helpdesk/urls.py
index 6772da22..c6c7379f 100644
--- a/helpdesk/urls.py
+++ b/helpdesk/urls.py
@@ -185,13 +185,14 @@ urlpatterns += [
 
 urlpatterns += [
     url(r'^login/$',
-        auth_views.login,
-        {'template_name': 'helpdesk/registration/login.html'},
+        auth_views.LoginView.as_view(
+            template_name='helpdesk/registration/login.html'),
         name='login'),
 
     url(r'^logout/$',
-        auth_views.logout,
-        {'template_name': 'helpdesk/registration/login.html', 'next_page': '../'},
+        auth_views.LogoutView.as_view(
+            template_name='helpdesk/registration/login.html',
+            next_page='../'),
         name='logout'),
 ]
 
diff --git a/setup.py b/setup.py
index dd17d3f9..918241ba 100644
--- a/setup.py
+++ b/setup.py
@@ -131,6 +131,7 @@ setup(
         "Programming Language :: Python :: 3.7",
         "Framework :: Django",
         "Framework :: Django :: 2.0",
+        "Framework :: Django :: 2.1",
         "Environment :: Web Environment",
         "Operating System :: OS Independent",
         "Intended Audience :: Customer Service",