Remove bug that deleted shipper info

Also hide password contents on display
Merge branch 'fix-info-display'