diff --git a/user/user.go b/user/user.go
index fd606d7c..a1b05de0 100644
--- a/user/user.go
+++ b/user/user.go
@@ -163,10 +163,9 @@ func ValidEmail(email string) bool {
 		return false
 	}
 
-	if address.Name != "" || address.Address == "" {
-		return false
-	}
-	return true
+	// Has mail.ParseAddress parsed the entire string and only found a single
+	// address without a name?
+	return address.Address == email
 }
 
 func ValidPassword(plaintext string) bool {
diff --git a/user/user_test.go b/user/user_test.go
index 31eeb082..eac81588 100644
--- a/user/user_test.go
+++ b/user/user_test.go
@@ -103,6 +103,9 @@ func TestValidEmail(t *testing.T) {
 		{"r@r.com", true},
 		{"Barry Gibbs <bg@example.com>", false},
 		{"", false},
+		{"invalidemail", false},
+		{"example@example.com example@example.com", false},
+		{"example@example.com Hello, 世界", false},
 	}
 
 	for i, tt := range tests {