diff --git a/auth/auth.go b/auth/auth.go
index 7009f549b..c9c77a1c6 100644
--- a/auth/auth.go
+++ b/auth/auth.go
@@ -48,12 +48,12 @@ func New(ctx context.Context, log *zap.Logger, s store.Storer, opt options.AuthO
 		defClient *types.AuthClient
 	)
 
-	log = log.Named("auth")
+	log = log.Named("auth").WithOptions(zap.AddStacktrace(zap.PanicLevel))
 	ctx = actionlog.RequestOriginToContext(ctx, actionlog.RequestOrigin_Auth)
 
 	svc = &service{
 		opt:      opt,
-		log:      log.WithOptions(zap.AddStacktrace(zap.PanicLevel)),
+		log:      log,
 		store:    s,
 		settings: &settings.Settings{ /* all disabled by default. */ },
 	}
diff --git a/auth/request/auth_user.go b/auth/request/auth_user.go
index 6d8c33a36..e3ddec52c 100644
--- a/auth/request/auth_user.go
+++ b/auth/request/auth_user.go
@@ -68,6 +68,10 @@ func (au *authUser) Update(s *settings.Settings, u *types.User) {
 }
 
 func (au *authUser) set(s *settings.Settings, u *types.User) {
+	if u == nil || s == nil {
+		return
+	}
+
 	if u.Meta == nil {
 		u.Meta = &types.UserMeta{}
 	}