More explicit saving of resource data. Fix to ensure passwords are saved correctly as well as we aren't saving any extra data we don't need.