Added protected user handling