diff --git a/cli_test.go b/cli_test.go
index 71f2bea5..2eedb5b4 100644
--- a/cli_test.go
+++ b/cli_test.go
@@ -32,6 +32,8 @@ func (s *Suite) TestRegisterMachine(c *check.C) {
 	machineAfterRegistering, err := app.RegisterMachine(
 		machine.MachineKey,
 		namespace.Name,
+		RegisterMethodCLI,
+		nil, nil, nil, nil,
 	)
 	c.Assert(err, check.IsNil)
 	c.Assert(machineAfterRegistering.Registered, check.Equals, true)
diff --git a/machine.go b/machine.go
index dac44591..3415b408 100644
--- a/machine.go
+++ b/machine.go
@@ -44,8 +44,10 @@ type Machine struct {
 
 	Registered     bool // temp
 	RegisterMethod string
-	AuthKeyID      uint
-	AuthKey        *PreAuthKey
+
+	// TODO(kradalby): This seems like irrelevant information?
+	AuthKeyID uint
+	AuthKey   *PreAuthKey
 
 	LastSeen             *time.Time
 	LastSuccessfulUpdate *time.Time
@@ -686,6 +688,13 @@ func (machine *Machine) toProto() *v1.Machine {
 func (h *Headscale) RegisterMachine(
 	machineKeyStr string,
 	namespaceName string,
+	registrationMethod string,
+
+	// Optionals
+	expiry *time.Time,
+	authKey *PreAuthKey,
+	nodePublicKey *string,
+	lastSeen *time.Time,
 ) (*Machine, error) {
 	namespace, err := h.GetNamespace(namespaceName)
 	if err != nil {
@@ -709,27 +718,13 @@ func (h *Headscale) RegisterMachine(
 		return nil, err
 	}
 
-	// TODO(kradalby): Currently, if it fails to find a requested expiry, non will be set
-	// This means that if a user is to slow with register a machine, it will possibly not
-	// have the correct expiry.
-	requestedTime := time.Time{}
-	if requestedTimeIf, found := h.requestedExpiryCache.Get(machineKey.String()); found {
-		log.Trace().
-			Caller().
-			Str("machine", machine.Name).
-			Msg("Expiry time found in cache, assigning to node")
-		if reqTime, ok := requestedTimeIf.(time.Time); ok {
-			requestedTime = reqTime
-		}
-	}
-
 	if machine.isRegistered() {
 		log.Trace().
 			Caller().
 			Str("machine", machine.Name).
 			Msg("machine already registered, reauthenticating")
 
-		h.RefreshMachine(machine, requestedTime)
+		h.RefreshMachine(machine, *expiry)
 
 		return machine, nil
 	}
@@ -739,17 +734,6 @@ func (h *Headscale) RegisterMachine(
 		Str("machine", machine.Name).
 		Msg("Attempting to register machine")
 
-	if machine.isRegistered() {
-		err := errMachineAlreadyRegistered
-		log.Error().
-			Caller().
-			Err(err).
-			Str("machine", machine.Name).
-			Msg("Attempting to register machine")
-
-		return nil, err
-	}
-
 	h.ipAllocationMutex.Lock()
 	defer h.ipAllocationMutex.Unlock()
 
@@ -764,17 +748,36 @@ func (h *Headscale) RegisterMachine(
 		return nil, err
 	}
 
-	log.Trace().
-		Caller().
-		Str("machine", machine.Name).
-		Str("ip", strings.Join(ips.ToStringSlice(), ",")).
-		Msg("Found IP for host")
-
 	machine.IPAddresses = ips
+
+	if expiry != nil {
+		machine.Expiry = expiry
+	}
+
+	if authKey != nil {
+		machine.AuthKeyID = uint(authKey.ID)
+	}
+
+	if nodePublicKey != nil {
+		machine.NodeKey = *nodePublicKey
+	}
+
+	if lastSeen != nil {
+		machine.LastSeen = lastSeen
+	}
+
 	machine.NamespaceID = namespace.ID
+
+	// TODO(kradalby): This field is uneccessary metadata,
+	// move it to tags instead of having a column.
+	machine.RegisterMethod = registrationMethod
+
+	// TODO(kradalby): Registered is a very frustrating value
+	// to keep up to date, and it makes is have to care if a
+	// machine is registered, authenticated and expired.
+	// Let us simplify the model, a machine is _only_ saved if
+	// it is registered.
 	machine.Registered = true
-	machine.RegisterMethod = RegisterMethodCLI
-	machine.Expiry = &requestedTime
 	h.db.Save(&machine)
 
 	log.Trace().