Updated account controller