Fix controllers for previous commit
Dry up account data