Final updates for account controller. Looks like this one is finished. [skip ci]