Auth improvements