Separate user mode concerns from AccountService