A few more changes for basic and guest users #418

Closed efe-onal-2016400267 closed 4 years ago