diff --git a/partitioncloud/__init__.py b/partitioncloud/__init__.py
index b16bcba..fda5557 100644
--- a/partitioncloud/__init__.py
+++ b/partitioncloud/__init__.py
@@ -68,7 +68,8 @@ def add_user():
                 # Success, go to the login page.
                 user = User(name=username)
                 try:
-                    user.join_album(album_uuid)
+                    if album_uuid != "":
+                        user.join_album(album_uuid)
                     flash(f"Utilisateur {username} créé")
                     return redirect("/albums")
                 except LookupError:
diff --git a/partitioncloud/templates/auth/register.html b/partitioncloud/templates/auth/register.html
index 14f2e20..0efbea1 100644
--- a/partitioncloud/templates/auth/register.html
+++ b/partitioncloud/templates/auth/register.html
@@ -12,6 +12,8 @@
     <input type="password" name="password" id="password" required>
     <input type="submit" value="Créer un compte">
   </form>
+{% if g.user.access_level == 1 %}
+<!-- Uniquement pour /add-user -->
 <label for="album_uuid">Ajouter à un album: </label>
 <select name="album_uuid" id="album_uuid" form="add-user-form">
   <option value="">Aucun</option>
@@ -19,4 +21,5 @@
   <option value="{{ album['uuid'] }}">{{ album["name"] }}</option>
   {% endfor %}
 </select>
+{% endif %}
 {% endblock %}
\ No newline at end of file