Broker Account Bugs fixed