diff --git a/server/service/service_errors.go b/server/service/service_errors.go
index 9d619e736e..17afe3a70a 100644
--- a/server/service/service_errors.go
+++ b/server/service/service_errors.go
@@ -96,6 +96,17 @@ type permissionError struct {
 	badArgs []invalidArgument
 }
 
+func newPermissionError(name, reason string) permissionError {
+	return permissionError{
+		badArgs: []invalidArgument{
+			invalidArgument{
+				name:   name,
+				reason: reason,
+			},
+		},
+	}
+}
+
 func (e permissionError) Error() string {
 	switch len(e.badArgs) {
 	case 0:
diff --git a/server/service/service_users.go b/server/service/service_users.go
index 8ff11ad530..fb24fb84ae 100644
--- a/server/service/service_users.go
+++ b/server/service/service_users.go
@@ -125,7 +125,7 @@ func (svc service) modifyEmailAddress(ctx context.Context, user *kolide.User, em
 	if password != nil {
 		err := user.ValidatePassword(*password)
 		if err != nil {
-			return permissionError{message: "incorrect password"}
+			return newPermissionError("password", "incorrect password")
 		}
 	}
 	random, err := kolide.RandomText(svc.config.App.TokenKeySize)