Improve master passwd change