Better auth support

Original message was deleted