After updating customer details, ensure state is transitioned as far to 'complete' as is possible

Fixes #2950
Fixes #2433