Switch to Composite Templates for LoginPage

Many more like this still to come