diff --git a/auth/views.py b/auth/views.py
index 94d459ce4fd1554634e11ca6e0a472ead72146c9..43d42be6119c5a97461c3f25f043b24f55882ab5 100644
--- a/auth/views.py
+++ b/auth/views.py
@@ -150,7 +150,7 @@ def start(request, system_name):
   system = AUTH_SYSTEMS[system_name]  
   
   # where to send the user to?
-  redirect_url = "%s%s" % (settings.URL_HOST,reverse(after))
+  redirect_url = "%s%s" % (settings.SECURE_URL_HOST,reverse(after))
   auth_url = system.get_auth_url(request, redirect_url=redirect_url)
   
   if auth_url:
@@ -194,5 +194,5 @@ def after_intervention(request):
   if request.session.has_key('auth_return_url'):
     return_url = request.session['auth_return_url']
     del request.session['auth_return_url']
-  return HttpResponseRedirect(return_url)
+  return HttpResponseRedirect("%s%s" % (settings.URL_HOST, return_url))
 
diff --git a/server_ui/templates/base.html b/server_ui/templates/base.html
index 8a870e4d723999a20232ce50d70f77d4e4e50c59..9e7df746af951140e2430821dced277ef43d2d84 100644
--- a/server_ui/templates/base.html
+++ b/server_ui/templates/base.html
@@ -53,7 +53,7 @@
 logged in as {{user.display_html_small|safe}}
 [<a href="{% url auth.views.logout %}?return_url={{CURRENT_URL}}">logout</a>]<br />
 {% else %}
-not logged in. [<a href="{% url auth.views.index %}?return_url={{CURRENT_URL}}">log in</a>]<br />
+not logged in. [<a href="{{settings.SECURE_URL_HOST}}{% url auth.views.index %}?return_url={{CURRENT_URL}}">log in</a>]<br />
 {% endif %}
 <a href="http://heliosvoting.org">About Helios</a>
 {% for footer_link in settings.FOOTER_LINKS %}