diff --git a/copanier/__init__.py b/copanier/__init__.py
index f11f08a..96090a2 100644
--- a/copanier/__init__.py
+++ b/copanier/__init__.py
@@ -111,11 +111,13 @@ async def auth_required(request, response):
         request["groups"] = groups
 
         group = groups.get_user_group(email)
-        user = Person(
-            email=email,
-            group_id=group.id,
-            group_name=group.name)
-
+        user_info = {'email': email}
+        if group:
+            user_info.update(dict(
+                group_id=group.id,
+                group_name=group.name)
+            )
+        user = Person(**user_info)
         request["user"] = user
         session.user.set(user)
 
diff --git a/copanier/templates/home.html b/copanier/templates/home.html
index 74265cc..4f6fb05 100644
--- a/copanier/templates/home.html
+++ b/copanier/templates/home.html
@@ -1,5 +1,10 @@
 {% extends "base.html" %}
 {% block body %}
+{% if not request['user'].group_id %}
+<p class="notification warning">Vous ne faites partie d'aucun groupe (coloc / famille). Si vous faites des commandes pour plusieurs personnes, merci de rejoindre un groupe.
+    <a href="/groupes" class="button">Rejoindre un groupe</a>
+</p>
+{% endif %}
     <h2>Livraisons à venir</h2>
     {% with deliveries=incoming %}
         {% include "includes/delivery_list.html" %}