Add "usersonly" for user group options
Small optimization
Merge branch '2.1' into notifications