diff --git a/app/static/app.css b/app/static/app.css
index acddf18..19855ea 100644
--- a/app/static/app.css
+++ b/app/static/app.css
@@ -55,6 +55,9 @@ a{color:var(--brand-dark)}
 .compact{gap:4px}
 .link-button{padding:0;font-weight:400}
 .form-grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:14px}
+.form-col{display:flex;flex-direction:column;gap:14px}
+.form-grid fieldset{margin:0;border:1px solid var(--line);border-radius:10px;padding:12px 14px 14px;min-width:0}
+.form-grid legend{padding:0 6px;font-weight:700;font-size:.9rem}
 .form-grid label,.stack label,.swap-form label{display:flex;flex-direction:column;gap:5px;font-weight:600;font-size:.9rem}
 input,select{width:100%;border:1px solid #cfc4c5;border-radius:8px;padding:9px 10px;background:#fff;color:var(--text);font:inherit}
 input:focus,select:focus,button:focus-visible,a:focus-visible,summary:focus-visible{outline:3px solid rgba(237,28,36,.24);outline-offset:2px;border-color:var(--brand)}
diff --git a/app/templates/admin_users.html b/app/templates/admin_users.html
index cb2d38b..9f47b71 100644
--- a/app/templates/admin_users.html
+++ b/app/templates/admin_users.html
@@ -1,18 +1,24 @@
 {% extends "base.html" %}
 {% block content %}
-<div class="page-head"><div><h1>Pessoas</h1><p class="muted">O e-mail e o telefone são opcionais. Só precisa de utilizador e palavra-passe se a pessoa entrar por conta própria; deixe ambos vazios para quem só aparece na escala.</p></div></div>
+<div class="page-head"><div><h1>Pessoas</h1></div></div>
 <section class="panel">
-  <h2>Adicionar pessoa</h2>
-  <form method="post" action="/admin/users" class="form-grid">
+  <div class="row between wrap gap">
+    <h2>Adicionar pessoa</h2>
+    <button class="primary" type="submit" form="add-person">Adicionar pessoa</button>
+  </div>
+  <form id="add-person" method="post" action="/admin/users" class="form-grid">
     <input type="hidden" name="csrf_token" value="{{ csrf_token }}">
-    <label>Nome<input name="name" required></label>
-    <label>Utilizador <span class="muted">(opcional)</span><input name="username" pattern="[A-Za-z0-9._-]+"></label>
-    <label>E-mail<input type="email" name="email"></label>
-    <label>Telefone<input name="phone"></label>
-    <label>Palavra-passe <span class="muted">(obrigatória com o utilizador)</span><input type="password" name="password" minlength="8"></label>
+    <div class="form-col">
+      <label>Nome<input name="name" required></label>
+      <label>Telefone<input name="phone"></label>
+      <label>E-mail<input type="email" name="email"></label>
+    </div>
+    <fieldset class="form-col">
+      <legend>Acesso (opcional)</legend>
+      <label>Utilizador<input name="username" pattern="[A-Za-z0-9._-]+"></label>
+      <label>Palavra-passe <span class="muted">(obrigatória com o utilizador)</span><input type="password" name="password" minlength="8"></label>
+    </fieldset>
     <label class="check"><input type="checkbox" name="notify_email" checked> Notificações por e-mail</label>
-    <label class="check"><input type="checkbox" name="is_admin"> Administrador</label>
-    <div><button class="primary" type="submit">Adicionar pessoa</button></div>
   </form>
 </section>
 <div class="stack gap-lg top-space">
@@ -21,11 +27,16 @@
   <summary><strong>{{ person.name }}</strong> <span class="muted">{% if person.can_login %}@{{ person.username }}{% else %}sem login{% endif %}{% if not person.is_active %} · inativa{% endif %}</span></summary>
   <form method="post" action="/admin/users/{{ person.id }}/update" class="form-grid top-space">
     <input type="hidden" name="csrf_token" value="{{ csrf_token }}">
-    <label>Nome<input name="name" value="{{ person.name }}" required></label>
-    <label>Utilizador <span class="muted">(vazio remove o login)</span><input name="username" pattern="[A-Za-z0-9._-]+" value="{{ person.username or '' }}"></label>
-    <label>E-mail<input type="email" name="email" value="{{ person.email or '' }}"></label>
-    <label>Telefone<input name="phone" value="{{ person.phone or '' }}"></label>
-    <label>Nova palavra-passe <span class="muted">(vazio para manter)</span><input type="password" name="new_password" minlength="8"></label>
+    <div class="form-col">
+      <label>Nome<input name="name" value="{{ person.name }}" required></label>
+      <label>Telefone<input name="phone" value="{{ person.phone or '' }}"></label>
+      <label>E-mail<input type="email" name="email" value="{{ person.email or '' }}"></label>
+    </div>
+    <fieldset class="form-col">
+      <legend>Acesso</legend>
+      <label>Utilizador <span class="muted">(vazio remove o login)</span><input name="username" pattern="[A-Za-z0-9._-]+" value="{{ person.username or '' }}"></label>
+      <label>Nova palavra-passe <span class="muted">(vazio para manter)</span><input type="password" name="new_password" minlength="8"></label>
+    </fieldset>
     <label class="check"><input type="checkbox" name="notify_email" {% if person.notify_email %}checked{% endif %}> Notificações por e-mail</label>
     <label class="check"><input type="checkbox" name="is_active" {% if person.is_active %}checked{% endif %}> Ativa</label>
     <label class="check"><input type="checkbox" name="is_admin" {% if person.is_admin %}checked{% endif %}> Administrador</label>
diff --git a/tests/test_admin_schedule_assignments.py b/tests/test_admin_schedule_assignments.py
index 2dfeb9a..f141d02 100644
--- a/tests/test_admin_schedule_assignments.py
+++ b/tests/test_admin_schedule_assignments.py
@@ -249,7 +249,6 @@ def test_saturday_page_only_shows_saturdays(client, db):
     page = client.get(f"/admin/schedules/{sat.id}?year={YEAR}&month={MONTH}").text
 
     assert page.count("assignment_") == len([d for d in range(1, 32) if date(2026, 10, d).weekday() == 5])
-    assert "Almoço - Domingo" in page  # listed under other schedules
     assert "Guardar Outubro" in page
 
 
diff --git a/tests/test_public_schedules.py b/tests/test_public_schedules.py
index 95dd5f2..2c99264 100644
--- a/tests/test_public_schedules.py
+++ b/tests/test_public_schedules.py
@@ -114,7 +114,7 @@ def test_rota_is_the_landing_page_for_signed_out_visitors(client, db):
 
     page = client.get("/", follow_redirects=False).text
 
-    assert ">Rota</p>" in page
+    assert month_name(date.today().month) in page
     assert '<a class="brand" href="/"' in page
     assert "Almoço - Sábados" in page
     assert "Entrar" in page
@@ -247,7 +247,7 @@ def test_rota_is_read_only_for_signed_out_visitors(client, db):
 
     page = client.get("/", follow_redirects=False).text
 
-    assert "Rota" in page
+    assert month_name(date.today().month) in page
     assert "Pedir troca" not in page
     assert "/swap" not in page
     assert client.get("/swaps", follow_redirects=False).status_code == 401
diff --git a/tests/test_users.py b/tests/test_users.py
index 60016dd..8b40679 100644
--- a/tests/test_users.py
+++ b/tests/test_users.py
@@ -169,7 +169,7 @@ def test_admin_cannot_remove_their_own_login(client, db, admin):
 
 def test_signed_in_home_is_the_rota_and_nav_has_no_rota_link(client, db, admin):
     landing = login(client, "admin", "admin-password")
-    assert ">Rota</p>" in landing
+    assert '<a class="brand" href="/"' in landing
 
     nav = client.get("/admin/users").text
     assert '<a href="/">Rota</a>' not in nav