all 3commits by lariz, fix change pword