Removes bug with admin rid assignment