Styling could be better, and I should test it, but this fixes #636.
Passing test for cbs login required.