Another client-side eID fix