Issue 441 by tj: Redefined user role check