Another attempt at reducing auth calls

This *should* only auth when the connection is created, but I haven't tested.