diff --git a/helpdesk/templates/helpdesk/base.html b/helpdesk/templates/helpdesk/base.html
index f5425bb6..e437de2d 100644
--- a/helpdesk/templates/helpdesk/base.html
+++ b/helpdesk/templates/helpdesk/base.html
@@ -99,7 +99,7 @@
                 {% if helpdesk_settings.HELPDESK_FOOTER_SHOW_API_LINK %}<a href='{% url helpdesk_api_help %}'>{% trans "API" %}</a>{% endif %}
                 <a href='{% url helpdesk_user_settings %}'>{% trans "User Settings" %}</a>
                 {% if helpdesk_settings.HELPDESK_FOOTER_SHOW_CHANGE_LANGUAGE_LINK %}
-                <a href='{% url helpdesk_public_change_language %}'>{% trans "Change Language" %}</a>
+                <a href='{% url helpdesk_public_change_language %}?return_to={{ request.path }}'>{% trans "Change Language" %}</a>
                 {% endif %}
                 {% if user.is_superuser %}<a href='{% url helpdesk_system_settings %}'>{% trans "System Settings" %}</a>{% endif %}</p>
             </div>
diff --git a/helpdesk/templates/helpdesk/public_change_language.html b/helpdesk/templates/helpdesk/public_change_language.html
index ead9b2fc..5d872773 100644
--- a/helpdesk/templates/helpdesk/public_change_language.html
+++ b/helpdesk/templates/helpdesk/public_change_language.html
@@ -6,7 +6,7 @@
 <h3>{% trans "Change the display language" %}</h3>
 <form action="/i18n/setlang/" method="post">
     {% csrf_token %}
-    <input name="next" type="hidden" value="/" />
+    <input name="next" type="hidden" value="{{ next|default:"/" }}" />
     <select name="language">
         {% get_language_info_list for LANGUAGES as languages %}
         {% for language in languages %}
diff --git a/helpdesk/views/public.py b/helpdesk/views/public.py
index 3f77ad37..1d34a55b 100644
--- a/helpdesk/views/public.py
+++ b/helpdesk/views/public.py
@@ -132,5 +132,9 @@ def view_ticket(request):
         }))
 
 def change_language(request):
+    return_to = ''
+    if request.GET.has_key('return_to'):
+        return_to = request.GET['return_to']
+
     return render_to_response('helpdesk/public_change_language.html',
-        RequestContext(request, {}))
+        RequestContext(request, {'next': return_to}))