Fix AccountController
Revert "Fix AccountController"

This reverts commit 1ecf36713c5c90f3306c4a186bf525a759210e5f.