Added role check to form groups