Added passwd and code harmonize