diff --git a/helpdesk/templates/helpdesk/navigation.html b/helpdesk/templates/helpdesk/navigation.html
index 6fc52b0d..4cc2ea89 100644
--- a/helpdesk/templates/helpdesk/navigation.html
+++ b/helpdesk/templates/helpdesk/navigation.html
@@ -28,8 +28,8 @@
 <li><a href='{% url helpdesk_home %}'>{% trans "Submit A Ticket" %}</a></li>
 {% endif %}
 {% if helpdesk_settings.HELPDESK_KB_ENABLED %}<li><a href='{% url helpdesk_kb_index %}'>{% trans "Knowledgebase" %}</a></li>{% endif %}
-{% if not helpdesk_settings.HELPDESK_REDIRECT_TO_LOGIN_BY_DEFAULT or user.is_authenticated %}
-<li>{% if user.is_authenticated %}<a href='{% url logout %}'>{% trans "Logout" %}</a>{% else %}<a href='{% url login %}?next={% url helpdesk_dashboard %}'>{% trans "Log In" %}</a>{% endif %}</li>
+{% if not request.path == '/helpdesk/login/' or user.is_authenticated %}
+<li>{% if user.is_authenticated %}<a href='{% url logout %}'>{% trans "Logout" %}</a>{% else %}<a href='{% url login %}?next={% if next %}{{ next|escape }}{% else %}{% url helpdesk_dashboard %}{% endif %}'>{% trans "Log In" %}</a>{% endif %}</li>
 {% endif %}
 </ul>
 {% endif %}
diff --git a/helpdesk/views/public.py b/helpdesk/views/public.py
index e7ee1682..d3506e9e 100644
--- a/helpdesk/views/public.py
+++ b/helpdesk/views/public.py
@@ -111,10 +111,16 @@ def view_ticket(request):
 
                 return update_ticket(request, ticket_id, public=True)
 
+            # redirect user back to this ticket if possible.
+            redirect_url = ''
+            if helpdesk_settings.HELPDESK_NAVIGATION_ENABLED:
+                redirect_url = reverse('helpdesk_view', args=[ticket_id])
+
             return render_to_response('helpdesk/public_view_ticket.html',
                 RequestContext(request, {
                     'ticket': ticket,
                     'helpdesk_settings': helpdesk_settings,
+                    'next': redirect_url,
                 }))
 
     return render_to_response('helpdesk/public_view_form.html',