Historical accounts bugfix

https://www.pivotaltracker.com/story/show/55910960