diff --git a/invites/handler/invites.go b/invites/handler/invites.go
index 93e175b..7c12764 100644
--- a/invites/handler/invites.go
+++ b/invites/handler/invites.go
@@ -64,7 +64,7 @@ func (i *Invites) Create(ctx context.Context, req *pb.CreateRequest, rsp *pb.Cre
 		ID:      uuid.New().String(),
 		Code:    generateCode(),
 		GroupID: req.GroupId,
-		Email:   req.Email,
+		Email:   strings.ToLower(req.Email),
 	}
 	if err := i.DB.Create(invite).Error; err != nil && strings.Contains(err.Error(), "group_email") {
 	} else if err != nil {
@@ -116,7 +116,7 @@ func (i *Invites) List(ctx context.Context, req *pb.ListRequest, rsp *pb.ListRes
 		query.GroupID = req.GroupId.Value
 	}
 	if req.Email != nil {
-		query.Email = req.Email.Value
+		query.Email = strings.ToLower(req.Email.Value)
 	}
 
 	// query the database
diff --git a/users/handler/handler.go b/users/handler/handler.go
index 9ad6726..b3f2732 100644
--- a/users/handler/handler.go
+++ b/users/handler/handler.go
@@ -97,7 +97,7 @@ func (u *Users) Create(ctx context.Context, req *pb.CreateRequest, rsp *pb.Creat
 			ID:        uuid.New().String(),
 			FirstName: req.FirstName,
 			LastName:  req.LastName,
-			Email:     req.Email,
+			Email:     strings.ToLower(req.Email),
 			Password:  phash,
 		}
 		err = u.DB.Create(user).Error
@@ -184,7 +184,7 @@ func (u *Users) Update(ctx context.Context, req *pb.UpdateRequest, rsp *pb.Updat
 		user.LastName = req.LastName.Value
 	}
 	if req.Email != nil {
-		user.Email = req.Email.Value
+		user.Email = strings.ToLower(req.Email.Value)
 	}
 
 	// write the user to the database