Change PassWd bugfix