--- a/src/cm/templates/site/non_authenticated_index.html	Thu Oct 03 11:57:33 2013 +0200
+++ b/src/cm/templates/site/non_authenticated_index.html	Thu Oct 10 09:37:17 2013 +0200
@@ -11,7 +11,16 @@
 
 {% block content %}
 
-<h1 class="main_title"><a class="title" href="{% url index %}">{{ CONF.workspace_name }}</a></h1>
+<h1 class="main_title">
+{% if CONF.f_get_logo_url %}
+<div><a title="{% blocktrans %}back to workspace{% endblocktrans %}" alt="logo" class="title" href="{% url index %}"><img src="{{ CONF.f_get_logo_url }}" /></a></div>
+{% else %}
+
+{% if CONF.workspace_name %}
+<a title="{% blocktrans %}back to workspace{% endblocktrans %}" class="title" href="{% url index %}">{{ CONF.workspace_name }}</a>
+{% endif %}
+{% endif %}
+</h1>
 
 {% if public_texts %}
 <table class="home-table">
@@ -37,4 +46,4 @@
 {% endif %}
 
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}