show openid-login only if enabled (default)
Merge branch 'master' into openid-behavior