Rearrange tasks related to auth server