diff --git a/templates/web/login/include/language-block.html.twig b/templates/web/login/include/language-block.html.twig
index 37b4f8247b..596b122e08 100644
--- a/templates/web/login/include/language-block.html.twig
+++ b/templates/web/login/include/language-block.html.twig
@@ -7,7 +7,10 @@
 
 {% set currentUrl = app['request'].getBaseUrl() ~ app['request'].getPathInfo() ~ qs %}
 
-<div id="authentication-sidebar-language" class="text-right well-small">
+<div id="authentication-sidebar-language" class="text-right well-small clearfix">
+    <div class="pull-left">
+        <a href="{{ path("homepage") }}" title="{% trans "Home" %}"><i class="icon-home icon-white"></i></a>
+    </div>
     <div class="pull-right btn-group">
         <button id="language-button" class="btn btn-mini btn-flat dropdown-toggle" data-toggle="dropdown" type="button">
             {{ attribute(languages, app['locale']) }}
diff --git a/templates/web/login/layout/middle-bar-layout.html.twig b/templates/web/login/layout/middle-bar-layout.html.twig
index f6bc1eb452..3f4f975307 100644
--- a/templates/web/login/layout/middle-bar-layout.html.twig
+++ b/templates/web/login/layout/middle-bar-layout.html.twig
@@ -1,13 +1,21 @@
 {% extends "login/layout/base-layout.html.twig" %}
 
 {% block content_scaffholding %}
-     <div class="row-fluid full-height">
-        <div class="span4 offset4 full-height">
+     <div class="row-fluid">
+        <div class="span4 offset4">
             <div class="authentication-sidebar">
-                {% include "login/include/language-block.html.twig" %}
-                {% block  content %}
+                <div class="row-fluid">
+                    <div class="span12">
+                        {% include "login/include/language-block.html.twig" %}
+                    </div>
+                </div>
+                <div class="row-fluid">
+                    <div class="span12">
+                        {% block  content %}
 
-                {% endblock %}
+                        {% endblock %}
+                    </div>
+                </div>
             </div>
         </div>
     </div>
diff --git a/templates/web/login/layout/sidebar-layout.html.twig b/templates/web/login/layout/sidebar-layout.html.twig
index ac20cfd212..533dbfd966 100644
--- a/templates/web/login/layout/sidebar-layout.html.twig
+++ b/templates/web/login/layout/sidebar-layout.html.twig
@@ -41,7 +41,11 @@
         </div>
         <div class="span4 right-content">
             <div class="authentication-sidebar">
-                {% include "login/include/language-block.html.twig" %}
+                <div class="row-fluid">
+                    <div class="span12">
+                        {% include "login/include/language-block.html.twig" %}
+                     </div>
+                </div>
                 <div class="row-fluid">
                     <div class="span12">
                         {% block sidebar %} {% endblock %}