Accounts handling issues

Page 16 of 16