Password encoding updates - 6.1.x