Password save fixes