Make the urls backwards compatible
Merge branch 'logout' into hue