Issue #1162186 by andypost, bleen18, amateescu: Feature overlap with Login Toboggan and general cleanup.