#71 removed switch to admin