diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9d4d491..44768b3 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -14,6 +14,7 @@ Added
 -----
 * Support for python 3.6 and Django 1.11
 * Support for Django 2.0
+* Keep query string then redirecting from / to /login
 
 Fixes
 -----
diff --git a/cas_server/urls.py b/cas_server/urls.py
index a9cac30..1e874c0 100644
--- a/cas_server/urls.py
+++ b/cas_server/urls.py
@@ -19,7 +19,10 @@ from cas_server import views
 app_name = "cas_server"
 
 urlpatterns = [
-    url(r'^$', RedirectView.as_view(pattern_name="cas_server:login", permanent=False)),
+    url(
+        r'^$',
+        RedirectView.as_view(pattern_name="cas_server:login", permanent=False, query_string=True)
+    ),
     url(
         '^login$',
         sensitive_post_parameters('password')(