diff --git a/cmd/crowdsec-cli/machines.go b/cmd/crowdsec-cli/machines.go
index e5df01356..81a9754ad 100644
--- a/cmd/crowdsec-cli/machines.go
+++ b/cmd/crowdsec-cli/machines.go
@@ -71,9 +71,9 @@ func generateID() (string, error) {
 			return "", errors.Wrap(err, "generating machine id")
 		}
 		id = string(bID)
-		id = strings.ReplaceAll(id, "-", "")[:32]
 	}
 	id = fmt.Sprintf("%s%s", id, generatePassword(16))
+	id = strings.ReplaceAll(id, "-", "")[:32]
 	return id, nil
 }