diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index eba45e373a..d5b7ae0893 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -430,9 +430,6 @@ def university_profile(request, org_id):
     context = dict(courses=courses, org_id=org_id)
     template_file = "university_profile/{0}.html".format(org_id).lower()
 
-    if request.REQUEST.get('next', False):
-        context['show_login_immediately'] = True
-
     return render_to_response(template_file, context)
 
 def render_notifications(request, course, notifications):
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 4681f5fd9a..f60c8ea5b0 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -525,6 +525,7 @@ PIPELINE_JS = {
             'js/my_courses_dropdown.js',
             'js/toggle_login_modal.js',
             'js/sticky_filter.js',
+            'js/query-params.js',
         ],
         'output_filename': 'js/lms-application.js'
     },
diff --git a/lms/templates/index.html b/lms/templates/index.html
index 89b4d06eab..fc6f1f336b 100644
--- a/lms/templates/index.html
+++ b/lms/templates/index.html
@@ -147,7 +147,6 @@
 
 
 <%block name="js_extra">
- <script type="text/javascript" src="${static.url('js/query-params.js')}"></script>
    <script type="text/javascript"">
       $(window).load(function() {
          if(getParameterByName('next')) {
diff --git a/lms/templates/login_modal.html b/lms/templates/login_modal.html
index 0b19399fc0..1383cc0965 100644
--- a/lms/templates/login_modal.html
+++ b/lms/templates/login_modal.html
@@ -46,11 +46,11 @@
 (function() {
    $(document).delegate('#login_form', 'ajax:success', function(data, json, xhr) {
      if(json.success) {
-       % if request.REQUEST.get('next', False):
-           location.href="${request.REQUEST.get('next')}";
-       % else:
-           location.href="${reverse('dashboard')}";
-       % endif
+        if(getParameterByName('next')) {
+           location.href = getParameterByName('next');
+       } else {
+           location.href = "${reverse('dashboard')}";
+       }
      } else {
        if($('#login_error').length == 0) {
          $('#login_form').prepend('<div id="login_error" class="modal-form-error"></div>');