Ensured admin access works consistently. #2