added missing setting place
Merge branch 'master' into validate_user