diff --git a/templates/login.html b/templates/login.html
index 8acb77c..5903f67 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -3,8 +3,8 @@
 {% block content %}
 <form method="post" class=login>
 <table>
-<tr><td>Username</td><td><input type="text" name="username"></td></tr>
-<tr><td>Password</td><td><input type="password" name="password"></td></tr>
+<tr><td>Username</td><td><input type="text" name="username" required></td></tr>
+<tr><td>Password</td><td><input type="password" name="password" required></td></tr>
 </table>
 <input type="submit" value="Login">
 </form>
diff --git a/templates/register.html b/templates/register.html
index be15687..17d80aa 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -4,8 +4,8 @@
 {%- if config.registration_enabled -%}
 <form method="post" class=login>
 <table>
-<tr><td>Username</td><td><input type="text" name="username" minlength=3></td></tr>
-<tr><td>Password</td><td><input type="password" name="password" minlength=8></td></tr>
+<tr><td>Username</td><td><input type="text" name="username" minlength=3 required></td></tr>
+<tr><td>Password</td><td><input type="password" name="password" minlength=8 required></td></tr>
 <tr><td>{{ captcha }}</td><td><input type="text" name="captcha"></td></tr>
 </table>
 <input name="answer" value="{{ answer }}" hidden>
diff --git a/templates/user_edit.html b/templates/user_edit.html
index 7101861..2243f80 100644
--- a/templates/user_edit.html
+++ b/templates/user_edit.html
@@ -13,8 +13,8 @@
 <br>
 <form method="post" action=edit/password/>
 <table>
-<tr><td>Old password</td><td><input type=password name=old></td></tr>
-<tr><td>New password</td><td><input type=password name=new></td></tr>
+<tr><td>Old password</td><td><input type=password name=old required></td></tr>
+<tr><td>New password</td><td><input type=password name=new required></td></tr>
 </table>
 <input type="submit" value="Set password">
 </form>