Fix to enable entry new accounts
Merge branch 'fix/entry-new-account'