Fix account page

Something to be careful with.

If you don't like the renaming, that's its own commit, so it should be easy to just merge the strictly bugfix commit.