diff --git a/docs/css/custom.css b/docs/css/custom.css
index a15d383..a004e6f 100644
--- a/docs/css/custom.css
+++ b/docs/css/custom.css
@@ -1085,11 +1085,16 @@
 /* ── Auth pages (login / signup) ───────────────────────────────────────── */
 
 .auth-page__services {
-	margin: -0.4rem 0 1rem;
+	margin-top: 25px;
+	margin-bottom: -25px;
 	font-size: 0.78rem;
 	line-height: 1.45;
 }
 
+.services-group__title {
+	font-size: inherit;
+}
+
 .auth-page {
 	max-width: 420px;
 	margin: 2.5rem auto 0;
diff --git a/docs/services/index.html b/docs/services/index.html
index 507677a..050a8d8 100644
--- a/docs/services/index.html
+++ b/docs/services/index.html
@@ -5,4 +5,4 @@
 <a href=/signup/ class="auth-link auth-link--signup">Sign Up</a></div></div><div class=rss-subscribe><button class=rss-subscribe__btn aria-label="Subscribe via RSS" title="Subscribe via RSS">
 <svg viewBox="0 0 24 24" width="10" height="10" fill="currentColor" aria-hidden="true"><path d="M6.18 15.64a2.18 2.18.0 012.18 2.18c0 1.19-.98 2.18-2.18 2.18C4.98 20 4 19.01 4 17.82a2.18 2.18.0 012.18-2.18M4 4.44A15.56 15.56.0 0119.56 20h-2.83A12.73 12.73.0 004 7.27V4.44m0 5.66a9.9 9.9.0 019.9 9.9h-2.83A7.07 7.07.0 004 12.93V10.1z"/></svg>
 <span>Subscribe</span></button><div class=rss-subscribe__dropdown><button class=rss-subscribe__item data-rss-url=https://freedoms4.org/index.xml>All updates</button>
-<button class=rss-subscribe__item data-rss-url=https://freedoms4.org/blog/index.xml>Blog posts</button></div></div></div></div><nav class="menu language"><ul class="menu__list language__list"><li class=menu__item><a class=menu__link href=/>Home</a></li><li class=menu__item><a class=menu__link href=/blog/>Blog</a></li><li class=menu__item><a class=menu__link href=/services/>Services</a></li><li class=menu__item><a class=menu__link href=/uninotes/>UniNotes</a></li><li class=menu__item><a class=menu__link href=/contact/>Contact</a></li></ul></nav></header><main class=main><nav class="uninotes-breadcrumbs breadcrumbs"><a href=/services/>Services</a></nav><h1>Services</h1><h2>Need Registration</h2><ol class="uninotes-list uninotes-list--subjects"><li class=uninotes-list__item><a class=uninotes-list__link href=/services/email-account/>Email</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/services/xmpp-account/>XMPP</a></li></ol><h2>Without Registration</h2><ol class="uninotes-list uninotes-list--subjects"><li class=uninotes-list__item><a class=uninotes-list__link href=/services/file-share/>File Share</a></li></ol></main><footer class=footer><p class=footer__copyright-notice>&copy; <a href=https://freedoms4.org>freedoms4.org</a> <a href=/changelog/>Changelog</a></p><p class=footer__theme-info>Built with <a href=https://gohugo.io>Hugo</a> and based on <a href=https://github.com/CyrusYip/hugo-theme-yue>Yue</a> theme</p></footer><script>(function(){document.querySelectorAll(".menu__item").forEach(function(e){var t=e.querySelector("a");t&&t.getAttribute("href")==="/uninotes/"&&e.classList.add("menu__item--uninotes")})})()</script><script>(function(){var e=document.getElementById("theme-toggle");if(!e)return;function t(){var e=localStorage.getItem("theme");return e?e:window.matchMedia("(prefers-color-scheme: light)").matches?"light":"dark"}function n(e){document.documentElement.setAttribute("data-theme",e),localStorage.setItem("theme",e)}n(t()),e.addEventListener("click",function(){var e=document.documentElement.getAttribute("data-theme")||t();n(e==="dark"?"light":"dark")})})()</script><script>(function(){var t="https://backend.freedoms4.org/auth.php",e=localStorage.getItem("f4_username");if(!e)return;function n(e){var t,n,o,i,a,c,r=document.querySelector(".brand__auth");r&&!r.querySelector(".brand__auth-user")&&(r.classList.add("brand__auth--loggedin"),t=document.createElement("div"),t.className="brand__auth-user",n=document.createElement("button"),n.className="brand__auth-user-btn",n.setAttribute("aria-label","Account menu"),c=document.createElement("span"),c.innerHTML='<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="12" height="12" fill="currentColor"><path d="M12 12c2.7 0 4.8-2.1 4.8-4.8S14.7 2.4 12 2.4 7.2 4.5 7.2 7.2 9.3 12 12 12zm0 2.4c-3.2 0-9.6 1.6-9.6 4.8v2.4h19.2v-2.4c0-3.2-6.4-4.8-9.6-4.8z"/></svg>',n.appendChild(c.firstChild),n.appendChild(document.createTextNode(" "+e)),o=document.createElement("div"),o.className="brand__auth-user-dropdown",i=document.createElement("button"),i.className="brand__auth-user-logout",i.textContent="Log Out",i.addEventListener("click",s),e==="hyzen"&&(a=document.createElement("a"),a.className="brand__auth-user-admin",a.href="/admin/",a.textContent="User Management",o.appendChild(a)),o.appendChild(i),o.appendChild(i),t.appendChild(n),t.appendChild(o),r.appendChild(t),n.addEventListener("click",function(e){e.stopPropagation(),t.classList.toggle("is-open")}),document.addEventListener("click",function(){t.classList.remove("is-open")}))}function s(){fetch(t,{method:"POST",headers:{"Content-Type":"application/json"},credentials:"include",body:JSON.stringify({action:"logout"})}).finally(function(){localStorage.removeItem("f4_username"),localStorage.removeItem("f4_login_time"),localStorage.removeItem("f4_session_fails"),window.location.reload()})}n(e)})()</script><script>(function(){var t,e=document.querySelector(".rss-subscribe");if(!e)return;t=e.querySelector(".rss-subscribe__btn"),t.addEventListener("click",function(t){t.stopPropagation(),e.classList.toggle("is-open")}),document.addEventListener("click",function(t){e.contains(t.target)||e.classList.remove("is-open")}),e.querySelectorAll(".rss-subscribe__item").forEach(function(t){t.addEventListener("click",function(n){n.stopPropagation();var s,o=t.getAttribute("data-rss-url"),a=t.textContent;function i(){t.textContent="Copied!",setTimeout(function(){t.textContent=a,e.classList.remove("is-open")},1200)}try{s=document.createElement("textarea"),s.value=o,s.style.cssText="position:fixed;top:0;left:0;opacity:0;pointer-events:none;",document.body.appendChild(s),s.focus(),s.select(),document.execCommand("copy"),document.body.removeChild(s),i()}catch{navigator.clipboard&&navigator.clipboard.writeText(o).then(i).catch(function(){t.textContent=o})}})})})()</script></body></html>
\ No newline at end of file
+<button class=rss-subscribe__item data-rss-url=https://freedoms4.org/blog/index.xml>Blog posts</button></div></div></div></div><nav class="menu language"><ul class="menu__list language__list"><li class=menu__item><a class=menu__link href=/>Home</a></li><li class=menu__item><a class=menu__link href=/blog/>Blog</a></li><li class=menu__item><a class=menu__link href=/services/>Services</a></li><li class=menu__item><a class=menu__link href=/uninotes/>UniNotes</a></li><li class=menu__item><a class=menu__link href=/contact/>Contact</a></li></ul></nav></header><main class=main><nav class="uninotes-breadcrumbs breadcrumbs"><a href=/services/>Services</a></nav><h1>Services</h1><h2 class=services-group__title>Need Registration</h2><ol class="uninotes-list uninotes-list--subjects"><li class=uninotes-list__item><a class=uninotes-list__link href=/services/email-account/>Email</a></li><li class=uninotes-list__item><a class=uninotes-list__link href=/services/xmpp-account/>XMPP</a></li></ol><h2 class=services-group__title>Without Registration</h2><ol class="uninotes-list uninotes-list--subjects"><li class=uninotes-list__item><a class=uninotes-list__link href=/services/file-share/>File Share</a></li></ol></main><footer class=footer><p class=footer__copyright-notice>&copy; <a href=https://freedoms4.org>freedoms4.org</a> <a href=/changelog/>Changelog</a></p><p class=footer__theme-info>Built with <a href=https://gohugo.io>Hugo</a> and based on <a href=https://github.com/CyrusYip/hugo-theme-yue>Yue</a> theme</p></footer><script>(function(){document.querySelectorAll(".menu__item").forEach(function(e){var t=e.querySelector("a");t&&t.getAttribute("href")==="/uninotes/"&&e.classList.add("menu__item--uninotes")})})()</script><script>(function(){var e=document.getElementById("theme-toggle");if(!e)return;function t(){var e=localStorage.getItem("theme");return e?e:window.matchMedia("(prefers-color-scheme: light)").matches?"light":"dark"}function n(e){document.documentElement.setAttribute("data-theme",e),localStorage.setItem("theme",e)}n(t()),e.addEventListener("click",function(){var e=document.documentElement.getAttribute("data-theme")||t();n(e==="dark"?"light":"dark")})})()</script><script>(function(){var t="https://backend.freedoms4.org/auth.php",e=localStorage.getItem("f4_username");if(!e)return;function n(e){var t,n,o,i,a,c,r=document.querySelector(".brand__auth");r&&!r.querySelector(".brand__auth-user")&&(r.classList.add("brand__auth--loggedin"),t=document.createElement("div"),t.className="brand__auth-user",n=document.createElement("button"),n.className="brand__auth-user-btn",n.setAttribute("aria-label","Account menu"),c=document.createElement("span"),c.innerHTML='<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="12" height="12" fill="currentColor"><path d="M12 12c2.7 0 4.8-2.1 4.8-4.8S14.7 2.4 12 2.4 7.2 4.5 7.2 7.2 9.3 12 12 12zm0 2.4c-3.2 0-9.6 1.6-9.6 4.8v2.4h19.2v-2.4c0-3.2-6.4-4.8-9.6-4.8z"/></svg>',n.appendChild(c.firstChild),n.appendChild(document.createTextNode(" "+e)),o=document.createElement("div"),o.className="brand__auth-user-dropdown",i=document.createElement("button"),i.className="brand__auth-user-logout",i.textContent="Log Out",i.addEventListener("click",s),e==="hyzen"&&(a=document.createElement("a"),a.className="brand__auth-user-admin",a.href="/admin/",a.textContent="User Management",o.appendChild(a)),o.appendChild(i),o.appendChild(i),t.appendChild(n),t.appendChild(o),r.appendChild(t),n.addEventListener("click",function(e){e.stopPropagation(),t.classList.toggle("is-open")}),document.addEventListener("click",function(){t.classList.remove("is-open")}))}function s(){fetch(t,{method:"POST",headers:{"Content-Type":"application/json"},credentials:"include",body:JSON.stringify({action:"logout"})}).finally(function(){localStorage.removeItem("f4_username"),localStorage.removeItem("f4_login_time"),localStorage.removeItem("f4_session_fails"),window.location.reload()})}n(e)})()</script><script>(function(){var t,e=document.querySelector(".rss-subscribe");if(!e)return;t=e.querySelector(".rss-subscribe__btn"),t.addEventListener("click",function(t){t.stopPropagation(),e.classList.toggle("is-open")}),document.addEventListener("click",function(t){e.contains(t.target)||e.classList.remove("is-open")}),e.querySelectorAll(".rss-subscribe__item").forEach(function(t){t.addEventListener("click",function(n){n.stopPropagation();var s,o=t.getAttribute("data-rss-url"),a=t.textContent;function i(){t.textContent="Copied!",setTimeout(function(){t.textContent=a,e.classList.remove("is-open")},1200)}try{s=document.createElement("textarea"),s.value=o,s.style.cssText="position:fixed;top:0;left:0;opacity:0;pointer-events:none;",document.body.appendChild(s),s.focus(),s.select(),document.execCommand("copy"),document.body.removeChild(s),i()}catch{navigator.clipboard&&navigator.clipboard.writeText(o).then(i).catch(function(){t.textContent=o})}})})})()</script></body></html>
\ No newline at end of file
diff --git a/docs/signup/index.html b/docs/signup/index.html
index 29acd13..e3e8908 100644
--- a/docs/signup/index.html
+++ b/docs/signup/index.html
@@ -5,8 +5,7 @@
 <a href=/signup/ class="auth-link auth-link--signup">Sign Up</a></div></div><div class=rss-subscribe><button class=rss-subscribe__btn aria-label="Subscribe via RSS" title="Subscribe via RSS">
 <svg viewBox="0 0 24 24" width="10" height="10" fill="currentColor" aria-hidden="true"><path d="M6.18 15.64a2.18 2.18.0 012.18 2.18c0 1.19-.98 2.18-2.18 2.18C4.98 20 4 19.01 4 17.82a2.18 2.18.0 012.18-2.18M4 4.44A15.56 15.56.0 0119.56 20h-2.83A12.73 12.73.0 004 7.27V4.44m0 5.66a9.9 9.9.0 019.9 9.9h-2.83A7.07 7.07.0 004 12.93V10.1z"/></svg>
 <span>Subscribe</span></button><div class=rss-subscribe__dropdown><button class=rss-subscribe__item data-rss-url=https://freedoms4.org/index.xml>All updates</button>
-<button class=rss-subscribe__item data-rss-url=https://freedoms4.org/blog/index.xml>Blog posts</button></div></div></div></div><nav class="menu language"><ul class="menu__list language__list"><li class=menu__item><a class=menu__link href=/>Home</a></li><li class=menu__item><a class=menu__link href=/blog/>Blog</a></li><li class=menu__item><a class=menu__link href=/services/>Services</a></li><li class=menu__item><a class=menu__link href=/uninotes/>UniNotes</a></li><li class=menu__item><a class=menu__link href=/contact/>Contact</a></li></ul></nav></header><main class=main><div class=auth-page><div class=auth-card><h1 class=auth-page__title>Sign Up</h1><p class=auth-page__services>By signing up, you will get access to these services:
-<a href=/services/email-account/>Email</a>, <a href=/services/xmpp-account/>XMPP</a>.</p><div id=auth-message class=auth-message aria-live=polite></div><form id=signup-form class=auth-form novalidate><div class=auth-form__input-wrap><div class=auth-form__group><label class=auth-form__label for=signup-username>Username</label>
+<button class=rss-subscribe__item data-rss-url=https://freedoms4.org/blog/index.xml>Blog posts</button></div></div></div></div><nav class="menu language"><ul class="menu__list language__list"><li class=menu__item><a class=menu__link href=/>Home</a></li><li class=menu__item><a class=menu__link href=/blog/>Blog</a></li><li class=menu__item><a class=menu__link href=/services/>Services</a></li><li class=menu__item><a class=menu__link href=/uninotes/>UniNotes</a></li><li class=menu__item><a class=menu__link href=/contact/>Contact</a></li></ul></nav></header><main class=main><div class=auth-page><div class=auth-card><h1 class=auth-page__title>Sign Up</h1><p class=auth-page__services>(By signing up, you will get access to the following services: <a href=/services/email-account/>Email</a>, <a href=/services/xmpp-account/>XMPP</a>)</p><div id=auth-message class=auth-message aria-live=polite></div><form id=signup-form class=auth-form novalidate><div class=auth-form__input-wrap><div class=auth-form__group><label class=auth-form__label for=signup-username>Username</label>
 <input class=auth-form__input type=text id=signup-username name=username autocomplete=username required minlength=3 maxlength=32 pattern=[a-zA-Z0-9_\-]+>
 <span class=auth-form__hint>(3-32 characters; letters, numbers, _ and - only)</span></div><div class=auth-form__group><label class=auth-form__label for=signup-email>Email</label>
 <input class=auth-form__input type=email id=signup-email name=email autocomplete=email required></div><div class=auth-form__group><label class=auth-form__label for=signup-password>Password</label>
diff --git a/layouts/services/section.html b/layouts/services/section.html
index d80cfc9..c118366 100644
--- a/layouts/services/section.html
+++ b/layouts/services/section.html
@@ -17,7 +17,7 @@
 {{ end }}
 
 {{ with $registrationServices }}
-<h2>Need Registration</h2>
+<h2 class="services-group__title">Need Registration</h2>
 <ol class="uninotes-list uninotes-list--subjects">
 	{{ range . }}
 	<li class="uninotes-list__item">
@@ -28,7 +28,7 @@
 {{ end }}
 
 {{ with $openServices }}
-<h2>Without Registration</h2>
+<h2 class="services-group__title">Without Registration</h2>
 <ol class="uninotes-list uninotes-list--subjects">
 	{{ range . }}
 	<li class="uninotes-list__item">
diff --git a/layouts/signup/single.html b/layouts/signup/single.html
index 07f8621..076486f 100644
--- a/layouts/signup/single.html
+++ b/layouts/signup/single.html
@@ -2,22 +2,16 @@
 <div class="auth-page">
 	<div class="auth-card">
 		<h1 class="auth-page__title">{{ .Title }}</h1>
-		{{ with site.GetPage "/services" }}
-			{{ $registrationServices := slice }}
-			{{ range .Pages.ByWeight }}
-				{{ if index .Params "registration-needed" }}
-					{{ $registrationServices = $registrationServices | append . }}
-				{{ end }}
-			{{ end }}
-			{{ with $registrationServices }}
-			<p class="auth-page__services">
-				By signing up, you will get access to these services:
-				{{ range $index, $service := . }}{{ if $index }}, {{ end }}<a href="{{ $service.RelPermalink }}"
-						>{{ $service.LinkTitle }}</a
-					>{{ end }}.
-			</p>
-			{{ end }}
-		{{ end }}
+		{{ with site.GetPage "/services" }} {{ $registrationServices := slice }} {{ range
+		.Pages.ByWeight }} {{ if index .Params "registration-needed" }} {{ $registrationServices =
+		$registrationServices | append . }} {{ end }} {{ end }} {{ with $registrationServices }}
+		<p class="auth-page__services">
+			(By signing up, you will get access to the following services: {{ range $index, $service
+			:= . }}{{ if $index }}, {{ end }}<a href="{{ $service.RelPermalink }}"
+				>{{ $service.LinkTitle }}</a
+			>{{ end }})
+		</p>
+		{{ end }} {{ end }}
 		<div id="auth-message" class="auth-message" aria-live="polite"></div>
 
 		<!-- ── STEP 1 — Account details ───────────────────────────────── -->
diff --git a/static/css/custom.css b/static/css/custom.css
index a15d383..a004e6f 100644
--- a/static/css/custom.css
+++ b/static/css/custom.css
@@ -1085,11 +1085,16 @@
 /* ── Auth pages (login / signup) ───────────────────────────────────────── */
 
 .auth-page__services {
-	margin: -0.4rem 0 1rem;
+	margin-top: 25px;
+	margin-bottom: -25px;
 	font-size: 0.78rem;
 	line-height: 1.45;
 }
 
+.services-group__title {
+	font-size: inherit;
+}
+
 .auth-page {
 	max-width: 420px;
 	margin: 2.5rem auto 0;