Abstract GetClient() & AccountController
Merge