diff --git a/pkg/id/id.go b/pkg/id/id.go
index b5a12d91a34d75cab49317001b1d9a307ab120dd..e9339a6ddc8941203930ce308ec4d9e2c676c9c3 100644
--- a/pkg/id/id.go
+++ b/pkg/id/id.go
@@ -27,7 +27,8 @@ func GenerateNewID() string {
 }
 
 func ValidateID(id *string) error {
-	trimmedID := strings.TrimSpace(*id)
+	trimmedID := *id
+	trimmedID = strings.TrimSpace(trimmedID)
 	if trimmedID == "" {
 		return ErrEmptyID
 	}
@@ -37,18 +38,19 @@ func ValidateID(id *string) error {
 	if !isValidID(trimmedID) {
 		return errors.WithDetail(ErrNotValidID, "must begin with latin letters and contain latin letters, numbers or '-', '_'")
 	}
-
+	*id = trimmedID
 	return nil
 }
 
 func ValidateName(name *string) error {
-	trimmedName := strings.TrimSpace(*name)
+	trimmedName := *name
+	trimmedName = strings.TrimSpace(trimmedName)
 	if trimmedName == "" {
 		return ErrEmptyName
 	}
 	if len(trimmedName) > MaxLengthName {
 		return ErrLongName
 	}
-
+	*name = trimmedName
 	return nil
 }