diff --git a/helpers.go b/helpers.go
index 8657ef9..2fafe6c 100644
--- a/helpers.go
+++ b/helpers.go
@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"net/http"
 	"time"
-	"unicode"
 
 	"github.com/gorilla/context"
 	"github.com/lib/pq"
@@ -73,26 +72,6 @@ func currentTime() NullTime {
 	}
 }
 
-// http://stackoverflow.com/a/25840157/313548
-func verifyPassword(s string) (sevenOrMore, number, upper bool) {
-	letters := 0
-	for _, s := range s {
-		switch {
-		case unicode.IsNumber(s):
-			number = true
-		case unicode.IsUpper(s):
-			upper = true
-			letters++
-		case unicode.IsLetter(s) || s == ' ':
-			letters++
-		default:
-			// returns false, false, false, false
-		}
-	}
-	sevenOrMore = letters >= 7
-	return
-}
-
 func generateNonce() (string, error) {
 	b := make([]byte, 32)
 	_, err := rand.Read(b)
diff --git a/users.go b/users.go
index 94f2b5e..b59dc4c 100644
--- a/users.go
+++ b/users.go
@@ -106,16 +106,9 @@ func (u *User) validate() error {
 		validationError = true
 	}
 
-	if u.Password == "" {
-		uv.Password = append(uv.Password, MustProvideAValue)
+	if len(u.Password) < 8 {
+		uv.Password = append(uv.Password, "Password must be at least 8 characters")
 		validationError = true
-	} else {
-		sevenOrMore, number, upper := verifyPassword(u.Password)
-		if !sevenOrMore || !number || !upper {
-			uv.Password = append(uv.Password, "Password must be at least 8 characters"+
-				" long, and have at least one number and one uppercase letter")
-			validationError = true
-		}
 	}
 
 	if validationError {