diff --git a/partitioncloud/static/style.css b/partitioncloud/static/style.css
index f3623b0..edebf06 100644
--- a/partitioncloud/static/style.css
+++ b/partitioncloud/static/style.css
@@ -275,6 +275,10 @@ img.partition-thumbnail {
     height: 70vh;
 }
 
+#albums div {
+    padding: 5px;
+}
+
 .user {
     display: flex;
 }
diff --git a/partitioncloud/templates/base.html b/partitioncloud/templates/base.html
index 723503f..d9da290 100644
--- a/partitioncloud/templates/base.html
+++ b/partitioncloud/templates/base.html
@@ -50,7 +50,11 @@
       {% endif %}
       <h1>Albums</h1>
       <section id="albums">
-        {% if g.user and user.get_albums() | length != 0 %}
+        {% if not g.user %}
+          <div style="text-align: center;"><i>Connectez vous pour avoir accès à vos albums</i></div>
+        {% elif user.get_albums() | length == 0 %}
+          <div style="text-align: center;"><i>Aucun album disponible</i></div>
+        {% else %}
           {% for album in user.albums %}
           <a href="/albums/{{ album['uuid'] }}">
             <div class="album-cover" id="album-1">
@@ -58,8 +62,6 @@
             </div>
           </a>
           {% endfor %}
-        {% else %}
-        <div>Aucun album disponible</div>
         {% endif %}
       </section>