diff --git a/auth.go b/auth.go
new file mode 100644
index 0000000..506f165
--- /dev/null
+++ b/auth.go
@@ -0,0 +1,12 @@
+//go:build !nullauth
+
+package daisy
+
+import (
+	"github.com/1f349/cardcaldav"
+	"github.com/charmbracelet/log"
+)
+
+func NewAuth(db string, logger *log.Logger) AuthProvider {
+	return cardcaldav.NewAuth(db, logger)
+}
diff --git a/nullauth.go b/auth_stub.go
similarity index 77%
rename from nullauth.go
rename to auth_stub.go
index 25a4695..41957ae 100644
--- a/nullauth.go
+++ b/auth_stub.go
@@ -4,9 +4,14 @@ package daisy
 
 import (
 	"context"
+	"github.com/charmbracelet/log"
 	"net/http"
 )
 
+func NewAuth(db string, logger *log.Logger) AuthProvider {
+	return &nullAuth{}
+}
+
 type nullAuth struct{}
 
 func (n *nullAuth) Middleware(next http.Handler) http.Handler {
@@ -16,7 +21,3 @@ func (n *nullAuth) Middleware(next http.Handler) http.Handler {
 func (n *nullAuth) CurrentUserPrincipal(ctx context.Context) (string, error) {
 	return "/jane@example.com/", nil
 }
-
-func NullAuth(_ AuthProvider) AuthProvider {
-	return &nullAuth{}
-}
diff --git a/nullauth_stub.go b/nullauth_stub.go
deleted file mode 100644
index 9eacd04..0000000
--- a/nullauth_stub.go
+++ /dev/null
@@ -1,7 +0,0 @@
-//go:build !nullauth
-
-package daisy
-
-func NullAuth(provider AuthProvider) AuthProvider {
-	return provider
-}
diff --git a/server.go b/server.go
index 5b0cdcb..7a910ef 100644
--- a/server.go
+++ b/server.go
@@ -62,7 +62,7 @@ type AuthProvider interface {
 
 func NewHttpServer(conf Conf, wd string) *http.Server {
 	cardcaldav.SetupLogger(Logger)
-	principle := NullAuth(cardcaldav.NewAuth(conf.DB, Logger))
+	principle := NewAuth(conf.DB, Logger)
 
 	_, cardStorage, err := storage.NewFilesystem(filepath.Join(wd, "storage"), "/calendar/", "/contacts/", principle)
 	if err != nil {