#1566 | Fixing save address fields