Proper multi-auth linking

Fixes issue #21 and #28.