minor changes to be compatible with app encrypted passwords