diff --git a/main.go b/main.go
index 940612b..f46c6c2 100644
--- a/main.go
+++ b/main.go
@@ -71,8 +71,10 @@ func signUpFormHandler(w http.ResponseWriter, r *http.Request) {
 func signUpHandler(w http.ResponseWriter, r *http.Request) {
 	name := r.FormValue("name")
 	pw := r.FormValue("password")
-	if 0 == strings.Compare("name", "") || 0 == strings.Compare(pw, "") ||
-		!onlyLegalRunes(name) || len(name) > 140 {
+	pw2 := r.FormValue("password2")
+	if 0 != strings.Compare(pw, pw2) || 0 == strings.Compare("name", "") ||
+		0 == strings.Compare(pw, "") || !onlyLegalRunes(name) ||
+		len(name) > 140 {
 		execTemplate(w, "error.html", "Invalid values.")
 		return
 	}
diff --git a/templates/signupform.html b/templates/signupform.html
index b3da0d9..b73df9e 100644
--- a/templates/signupform.html
+++ b/templates/signupform.html
@@ -3,6 +3,7 @@
     <form method="POST" action="/signup">
         Name: <input type="text" name="name" /> (only up to 140 legal chars: A-Z, a-z, 0-1, _)<br />
         Password: <input type="password" name="password" /><br />
+        Password (repeat): <input type="password" name="password2" /><br />
         <input type="submit" value="create" />
     </form>
     <hr />