Bug 22343: Correctly handle password on editing