Working on passwd change for #2