Edit password cleanup