Fixes initial state for delivery address if it's a company address
Merge pull request #728 from nsendetzky/master

Fixes initial state for delivery address if it's a company address