Don't show Settings tab on user dashboard
Merge branch 'master' into saml2