diff --git a/docs/signup/index.html b/docs/signup/index.html
index 933f1e4..b9ab7e1 100644
--- a/docs/signup/index.html
+++ b/docs/signup/index.html
@@ -24,4 +24,4 @@
 <button type=button id=otp-resend class=otp-panel__resend-btn>
 Resend code
 </button>
-<span id=otp-resend-timer style=display:none></span></p></div></div><p class=auth-card__footer id=signup-footer>Already have an account? <a href=/login/ class=auth-card__link>Log in</a></p></div></div><script>(function(){var t,n,s,o,a,r,c,l,d,u,h,m,g,v,b,j,f="https://backend.freedoms4.org/auth.php";if(localStorage.getItem("f4_username")){document.getElementById("auth-message").textContent="You are already logged in!",document.getElementById("auth-message").className="auth-message auth-message--success is-visible",document.getElementById("signup-form").style.display="none",document.getElementById("signup-footer").style.display="none";return}if(s=new URLSearchParams(window.location.search).get("next")||sessionStorage.getItem("f4_login_next")||"",!s&&document.referrer)try{g=new URL(document.referrer),g.hostname===window.location.hostname&&(a=g.pathname,a!=="/login/"&&a!=="/signup/"&&(s=a,sessionStorage.setItem("f4_login_next",a)))}catch{}t={username:"",email:"",password:""},l=document.getElementById("auth-message"),d=document.getElementById("signup-form"),m=document.getElementById("signup-submit"),j=document.getElementById("otp-panel"),b=document.getElementById("otp-email-display"),o=document.getElementById("otp-input"),c=document.getElementById("otp-submit"),n=document.getElementById("otp-resend"),r=document.getElementById("otp-resend-timer"),u=document.getElementById("signup-password"),h=d.querySelector(".auth-form__eye");function e(e,t){l.textContent=e,l.className="auth-message auth-message--"+t+" is-visible"}function p(){l.className="auth-message"}function i(e,t){e.disabled=t,e.querySelector(".auth-form__submit-text").style.display=t?"none":"",e.querySelector(".auth-form__submit-loader").style.display=t?"inline-flex":"none"}h.addEventListener("click",function(){var e=u.type==="text";u.type=e?"password":"text",h.querySelector(".eye-show").style.display=e?"":"none",h.querySelector(".eye-hide").style.display=e?"none":""}),v=null;function y(e){n.style.display="none",r.style.display="";var t=e;r.textContent="Resend in "+t+"s",v=setInterval(function(){t--,t<=0?(clearInterval(v),r.style.display="none",n.style.display="",n.disabled=!1):r.textContent="Resend in "+t+"s"},1e3)}d.addEventListener("submit",function(n){n.preventDefault(),p();var r=document.getElementById("signup-username").value.trim(),s=document.getElementById("signup-email").value.trim(),a=u.value,c=document.getElementById("signup-confirm").value;if(!r||!s||!a||!c){e("Please fill in all fields.","error");return}if(!/^[a-zA-Z0-9_-]{3,32}$/.test(r)){e("Username must be 3–32 characters: letters, numbers, _ or -.","error");return}if(a.length<8){e("Password must be at least 8 characters.","error");return}if(a!==c){e("Passwords do not match.","error");return}t.username=r,t.email=s,t.password=a,i(m,!0),fetch(f,{method:"POST",headers:{"Content-Type":"application/json"},credentials:"include",body:JSON.stringify({action:"send_otp",email:s})}).then(function(e){return e.json()}).then(function(t){t.success?(d.style.display="none",b.textContent=s,j.style.display="",o.value="",o.focus(),y(60),e("OTP sent! Check your inbox (and spam folder).","success")):e(t.message||"Failed to send code. Please try again.","error")}).catch(function(){e("Network error. Please try again.","error")}).finally(function(){i(m,!1)})}),n.addEventListener("click",function(){p(),n.disabled=!0,fetch(f,{method:"POST",headers:{"Content-Type":"application/json"},credentials:"include",body:JSON.stringify({action:"send_otp",email:t.email})}).then(function(e){return e.json()}).then(function(t){t.success?(e("New code sent!","success"),y(60)):(e(t.message||"Could not resend. Please try again.","error"),n.disabled=!1)}).catch(function(){e("Network error. Please try again.","error"),n.disabled=!1})});function _(){p();var n=o.value.trim();if(!/^\d{6}$/.test(n)){e("Please enter the 6-digit code from your email.","error");return}i(c,!0),fetch(f,{method:"POST",headers:{"Content-Type":"application/json"},credentials:"include",body:JSON.stringify({action:"signup",username:t.username,email:t.email,password:t.password,otp:n})}).then(function(e){return e.json()}).then(function(t){t.success?(e("Account created! Redirecting to login…","success"),setTimeout(function(){var e="/login/";s&&s.startsWith("/")&&(e="/login/?next="+encodeURIComponent(s)),window.location.href=e},1800)):(e(t.message||"Sign-up failed. Please try again.","error"),i(c,!1))}).catch(function(){e("Network error. Please try again.","error"),i(c,!1)})}c.addEventListener("click",_),o.addEventListener("keydown",function(e){e.key==="Enter"&&_()})})()</script></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
+<span id=otp-resend-timer style=display:none></span></p></div></div><p class=auth-card__footer id=signup-footer>Already have an account? <a href=/login/ class=auth-card__link>Log in</a></p></div></div><script>(function(){var t,n,s,o,a,r,c,l,d,u,h,m,g,v,b,j,f="https://backend.freedoms4.org/auth.php";if(localStorage.getItem("f4_username")){document.getElementById("auth-message").textContent="You are already logged in!",document.getElementById("auth-message").className="auth-message auth-message--success is-visible",document.getElementById("signup-form").style.display="none",document.getElementById("signup-footer").style.display="none";return}if(s=new URLSearchParams(window.location.search).get("next")||sessionStorage.getItem("f4_login_next")||"",!s&&document.referrer)try{g=new URL(document.referrer),g.hostname===window.location.hostname&&(a=g.pathname,a!=="/login/"&&a!=="/signup/"&&(s=a,sessionStorage.setItem("f4_login_next",a)))}catch{}t={username:"",email:"",password:""},l=document.getElementById("auth-message"),d=document.getElementById("signup-form"),m=document.getElementById("signup-submit"),j=document.getElementById("otp-panel"),b=document.getElementById("otp-email-display"),o=document.getElementById("otp-input"),c=document.getElementById("otp-submit"),n=document.getElementById("otp-resend"),r=document.getElementById("otp-resend-timer"),u=document.getElementById("signup-password"),h=d.querySelector(".auth-form__eye");function e(e,t){l.textContent=e,l.className="auth-message auth-message--"+t+" is-visible"}function p(){l.className="auth-message"}function i(e,t){e.disabled=t,e.querySelector(".auth-form__submit-text").style.display=t?"none":"",e.querySelector(".auth-form__submit-loader").style.display=t?"inline-flex":"none"}h.addEventListener("click",function(){var e=u.type==="text";u.type=e?"password":"text",h.querySelector(".eye-show").style.display=e?"":"none",h.querySelector(".eye-hide").style.display=e?"none":""}),v=null;function y(e){n.style.display="none",r.style.display="";var t=e;r.textContent="Resend in "+t+"s",v=setInterval(function(){t--,t<=0?(clearInterval(v),r.style.display="none",n.style.display="",n.disabled=!1):r.textContent="Resend in "+t+"s"},1e3)}d.addEventListener("submit",function(n){n.preventDefault(),p();var s=document.getElementById("signup-username").value.trim(),a=document.getElementById("signup-email").value.trim(),r=u.value,c=document.getElementById("signup-confirm").value;if(!s||!a||!r||!c){e("Please fill in all fields.","error");return}if(!/^[a-zA-Z0-9_-]{3,32}$/.test(s)){e("Username must be 3–32 characters: letters, numbers, _ or -.","error");return}if(r.length<8){e("Password must be at least 8 characters.","error");return}if(r!==c){e("Passwords do not match.","error");return}t.username=s,t.email=a,t.password=r,i(m,!0),fetch(f,{method:"POST",headers:{"Content-Type":"application/json"},credentials:"include",body:JSON.stringify({action:"send_otp",username:s,email:a})}).then(function(e){return e.json()}).then(function(t){t.success?(d.style.display="none",b.textContent=a,j.style.display="",o.value="",o.focus(),y(60),e("OTP sent! Check your inbox (and spam folder).","success")):e(t.message||"Failed to send code. Please try again.","error")}).catch(function(){e("Network error. Please try again.","error")}).finally(function(){i(m,!1)})}),n.addEventListener("click",function(){p(),n.disabled=!0,fetch(f,{method:"POST",headers:{"Content-Type":"application/json"},credentials:"include",body:JSON.stringify({action:"send_otp",username:t.username,email:t.email})}).then(function(e){return e.json()}).then(function(t){t.success?(e("New code sent!","success"),y(60)):(e(t.message||"Could not resend. Please try again.","error"),n.disabled=!1)}).catch(function(){e("Network error. Please try again.","error"),n.disabled=!1})});function _(){p();var n=o.value.trim();if(!/^\d{6}$/.test(n)){e("Please enter the 6-digit code from your email.","error");return}i(c,!0),fetch(f,{method:"POST",headers:{"Content-Type":"application/json"},credentials:"include",body:JSON.stringify({action:"signup",username:t.username,email:t.email,password:t.password,otp:n})}).then(function(e){return e.json()}).then(function(t){t.success?(e("Account created! Redirecting to login…","success"),setTimeout(function(){var e="/login/";s&&s.startsWith("/")&&(e="/login/?next="+encodeURIComponent(s)),window.location.href=e},1800)):(e(t.message||"Sign-up failed. Please try again.","error"),i(c,!1))}).catch(function(){e("Network error. Please try again.","error"),i(c,!1)})}c.addEventListener("click",_),o.addEventListener("keydown",function(e){e.key==="Enter"&&_()})})()</script></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/layouts/signup/single.html b/layouts/signup/single.html
index 57d05c5..d5a1b05 100644
--- a/layouts/signup/single.html
+++ b/layouts/signup/single.html
@@ -302,7 +302,7 @@
 				method: 'POST',
 				headers: { 'Content-Type': 'application/json' },
 				credentials: 'include',
-				body: JSON.stringify({ action: 'send_otp', email: email }),
+				body: JSON.stringify({ action: 'send_otp', username: username, email: email }),
 			})
 				.then(function (r) {
 					return r.json();
@@ -337,7 +337,11 @@
 				method: 'POST',
 				headers: { 'Content-Type': 'application/json' },
 				credentials: 'include',
-				body: JSON.stringify({ action: 'send_otp', email: state.email }),
+				body: JSON.stringify({
+					action: 'send_otp',
+					username: state.username,
+					email: state.email,
+				}),
 			})
 				.then(function (r) {
 					return r.json();