Fix for admin registration & Tidying up messages