Tidy up of Core app

Couple improvements to Disqus SSO which need testing.