diff --git a/api.go b/api.go
index bda9d9bd..d85221bc 100644
--- a/api.go
+++ b/api.go
@@ -147,6 +147,8 @@ func (h *Headscale) RegistrationHandler(c *gin.Context) {
 			resp.AuthURL = ""
 			resp.MachineAuthorized = true
 			resp.User = *m.Namespace.toUser()
+			resp.Login = *m.Namespace.toLogin()
+
 			respBody, err := encode(resp, &mKey, h.privateKey)
 			if err != nil {
 				log.Error().
diff --git a/namespaces.go b/namespaces.go
index 2bf62bb3..212df9a6 100644
--- a/namespaces.go
+++ b/namespaces.go
@@ -216,3 +216,14 @@ func (n *Namespace) toUser() *tailcfg.User {
 	}
 	return &u
 }
+
+func (n *Namespace) toLogin() *tailcfg.Login {
+	l := tailcfg.Login{
+		ID:            tailcfg.LoginID(n.ID),
+		LoginName:     n.Name,
+		DisplayName:   n.Name,
+		ProfilePicURL: "",
+		Domain:        "headscale.net",
+	}
+	return &l
+}