Further fixes to accounts-entry

https://github.com/Differential/accounts-entry/issues/265