AccountController: some todos have been resolved