This is a PLZ specific change to support multiple user types.  We will fix this later and do a better, more generic change later