diff --git a/cmd/ui/ui.go b/cmd/ui/handlers.go
similarity index 94%
rename from cmd/ui/ui.go
rename to cmd/ui/handlers.go
index eb3ab51..92454e0 100644
--- a/cmd/ui/ui.go
+++ b/cmd/ui/handlers.go
@@ -61,6 +61,10 @@ func HandleAddUser(db *data.DB) http.HandlerFunc {
 		last := r.PostFormValue("last-name")
 		role := r.PostFormValue("role")
 
+		if inputsEmpty(user, pass, pass2, first, last, role) {
+			log.Println("inputsEmpty")
+			template.Must(template.ParseFiles("web/templates/add-user.html")).Execute(w, nil)
+		}
 		_, _, ok := checkUserStrings(user, first, last)
 		if !ok {
 			log.Println("checkUserStrings")
diff --git a/cmd/ui/helpers.go b/cmd/ui/helpers.go
index b88ffbe..6ea045a 100644
--- a/cmd/ui/helpers.go
+++ b/cmd/ui/helpers.go
@@ -1,5 +1,14 @@
 package ui
 
+func inputsEmpty(user, pass, pass2, first, last, role string) bool {
+	return len(user) == 0 ||
+		len(pass) == 0 ||
+		len(pass2) == 0 ||
+		len(first) == 0 ||
+		len(last) == 0 ||
+		len(role) == 0
+}
+
 func checkUserStrings(user, first, last string) (string, int, bool) {
 	userLen := 15
 	nameLen := 50
diff --git a/web/templates/add-user.html b/web/templates/add-user.html
index 4341202..4cfacfd 100644
--- a/web/templates/add-user.html
+++ b/web/templates/add-user.html
@@ -1,19 +1,19 @@
 {{define "page-content"}}
 <h2>Neuer Benutzer</h2>
 <form>
-    <input name="username" placeholder="Benutzername" type="text" />
-    <input name="password" placeholder="Passwort" type="password" />
-    <input name="password2" placeholder="Passwort wiederholen" type="password" />
+    <input required name="username" placeholder="Benutzername" type="text" />
+    <input required name="password" placeholder="Passwort" type="password" />
+    <input required name="password2" placeholder="Passwort wiederholen" type="password" />
 
-    <input name="first-name" placeholder="Vorname" type="text" />
-    <input name="last-name" placeholder="Nachname" type="text" />
+    <input required name="first-name" placeholder="Vorname" type="text" />
+    <input required name="last-name" placeholder="Nachname" type="text" />
 
     <label for="writer">Schreiber</label>
-    <input id="writer" name="role" type="radio" value="writer" />
+    <input required id="writer" name="role" type="radio" value="writer" />
     <label for="editor">Redakteur</label>
-    <input id="editor" name="role" type="radio" value="editor" />
+    <input required id="editor" name="role" type="radio" value="editor" />
     <label for="admin">Admin</label>
-    <input id="admin" name="role" type="radio" value="admin" />
+    <input required id="admin" name="role" type="radio" value="admin" />
 
     <input type="submit" value="Anlegen" hx-post="/add-user/" hx-target="#page-content" />
 </form>