Improvements on Owner Contact Name field save and load