Fixed modal showing before info loaded

When editing a client, modal would display before information had been
loaded into fields.  Fixed with when.then ($)