diff --git a/pkg/id/id.go b/pkg/id/id.go
index 1d61b721265233fed3e32e71423bea711bd178b7..b5a12d91a34d75cab49317001b1d9a307ab120dd 100644
--- a/pkg/id/id.go
+++ b/pkg/id/id.go
@@ -26,25 +26,27 @@ func GenerateNewID() string {
 	return xid.New().String()
 }
 
-func ValidateID(id string) error {
-	if strings.TrimSpace(id) == "" {
+func ValidateID(id *string) error {
+	trimmedID := strings.TrimSpace(*id)
+	if trimmedID == "" {
 		return ErrEmptyID
 	}
-	if len(id) > MaxLengthID {
+	if len(trimmedID) > MaxLengthID {
 		return ErrLongID
 	}
-	if !isValidID(id) {
+	if !isValidID(trimmedID) {
 		return errors.WithDetail(ErrNotValidID, "must begin with latin letters and contain latin letters, numbers or '-', '_'")
 	}
 
 	return nil
 }
 
-func ValidateName(name string) error {
-	if strings.TrimSpace(name) == "" {
+func ValidateName(name *string) error {
+	trimmedName := strings.TrimSpace(*name)
+	if trimmedName == "" {
 		return ErrEmptyName
 	}
-	if len(name) > MaxLengthName {
+	if len(trimmedName) > MaxLengthName {
 		return ErrLongName
 	}