For code review - don't merge

It might be better to expose /logout as the URL here.