diff --git a/api.go b/api.go
index 60ca63f2..f831cacf 100644
--- a/api.go
+++ b/api.go
@@ -154,6 +154,7 @@ func (h *Headscale) RegistrationHandler(ctx *gin.Context) {
 		)
 
 		h.handleMachineRegistrationNew(ctx, machineKey, req)
+
 		return
 	}
 
@@ -573,15 +574,19 @@ func (h *Headscale) handleAuthKey(
 	nodeKey := NodePublicKeyStripPrefix(registerRequest.NodeKey)
 	now := time.Now().UTC()
 
+	machineToRegister := Machine{
+		Name:           registerRequest.Hostinfo.Hostname,
+		NamespaceID:    pak.Namespace.ID,
+		MachineKey:     machineKeyStr,
+		RegisterMethod: RegisterMethodAuthKey,
+		Expiry:         &registerRequest.Expiry,
+		NodeKey:        nodeKey,
+		LastSeen:       &now,
+		AuthKeyID:      uint(pak.ID),
+	}
+
 	machine, err := h.RegisterMachine(
-		registerRequest.Hostinfo.Hostname,
-		machineKeyStr,
-		pak.Namespace.Name,
-		RegisterMethodAuthKey,
-		&registerRequest.Expiry,
-		pak,
-		&nodeKey,
-		&now,
+		machineToRegister,
 	)
 	if err != nil {
 		log.Error().
diff --git a/grpcv1.go b/grpcv1.go
index 3a2e19ce..75732b1d 100644
--- a/grpcv1.go
+++ b/grpcv1.go
@@ -415,11 +415,11 @@ func (api headscaleV1APIServer) DebugCreateMachine(
 		HostInfo: datatypes.JSON(hostinfoJson),
 	}
 
-	// log.Trace().Caller().Interface("machine", newMachine).Msg("")
-
-	if err := api.h.db.Create(&newMachine).Error; err != nil {
-		return nil, err
-	}
+	api.h.registrationCache.Set(
+		request.GetKey(),
+		newMachine,
+		requestedExpiryCacheExpiration,
+	)
 
 	return &v1.DebugCreateMachineResponse{Machine: newMachine.toProto()}, nil
 }
diff --git a/oidc.go b/oidc.go
index 48664aed..952e2600 100644
--- a/oidc.go
+++ b/oidc.go
@@ -344,7 +344,6 @@ func (h *Headscale) OIDCCallback(ctx *gin.Context) {
 
 			return
 		}
-
 	}
 
 	var content bytes.Buffer