Justin - ecard/admin fixes