diff --git a/internal/api/members/crud.go b/internal/api/members/crud.go
index b684414f..f5122a0c 100644
--- a/internal/api/members/crud.go
+++ b/internal/api/members/crud.go
@@ -12,57 +12,64 @@ type MemberCreatePayload struct {
 }
 
 type MemberDataPayload struct {
-	ID                 *string `json:"id"`
-	Secret             *string `json:"secret,omitempty"`
-	Name               *string `json:"name"`
-	IsAdmin            *bool   `json:"is_admin"`
-	CanLogin           *bool   `json:"can_login"`
-	CanConnect         *bool   `json:"can_connect"`
-	CanWatch           *bool   `json:"can_watch"`
-	CanHost            *bool   `json:"can_host"`
-	CanAccessClipboard *bool   `json:"can_access_clipboard"`
+	ID                 string `json:"id"`
+	Secret             string `json:"secret,omitempty"`
+	Name               string `json:"name"`
+	IsAdmin            bool   `json:"is_admin"`
+	CanLogin           bool   `json:"can_login"`
+	CanConnect         bool   `json:"can_connect"`
+	CanWatch           bool   `json:"can_watch"`
+	CanHost            bool   `json:"can_host"`
+	CanAccessClipboard bool   `json:"can_access_clipboard"`
 }
 
 func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) {
-	data := &MemberDataPayload{}
+	data := &MemberDataPayload{
+		IsAdmin: false,
+		CanLogin: true,
+		CanConnect: true,
+		CanWatch: true,
+		CanHost: true,
+		CanAccessClipboard: true,
+	}
+
 	if !utils.HttpJsonRequest(w, r, data) {
 		return
 	}
 
-	if data.Secret == nil || *data.Secret == "" {
+	if data.Secret == "" {
 		utils.HttpBadRequest(w, "Secret cannot be empty.")
 		return
 	}
 
-	if data.Name == nil || *data.Name == "" {
+	if data.Name == "" {
 		utils.HttpBadRequest(w, "Name cannot be empty.")
 		return
 	}
 
-	var ID string
-	if data.ID == nil || *data.ID == "" {
+	if data.ID == "" {
 		var err error
-		if ID, err = utils.NewUID(32); err != nil {
+		if data.ID, err = utils.NewUID(32); err != nil {
 			utils.HttpInternalServerError(w, err)
 			return
 		}
 	} else {
-		ID = *data.ID
-		if _, ok := h.sessions.Get(ID); ok {
+		if _, ok := h.sessions.Get(data.ID); ok {
 			utils.HttpBadRequest(w, "Member ID already exists.")
 			return
 		}
 	}
 
-	session, err := h.sessions.Create(ID, types.MemberProfile{
-		Secret: *data.Secret,
-		Name: *data.Name,
-		IsAdmin: defaultBool(data.IsAdmin, false),
-		CanLogin: defaultBool(data.CanLogin, true),
-		CanConnect: defaultBool(data.CanConnect, true),
-		CanWatch: defaultBool(data.CanWatch, true),
-		CanHost: defaultBool(data.CanHost, true),
-		CanAccessClipboard: defaultBool(data.CanAccessClipboard, true),
+	// TODO: Join structs?
+	session, err := h.sessions.Create(data.ID, types.MemberProfile{
+		Secret: data.Secret,
+		Name: data.Name,
+		IsAdmin: data.IsAdmin,
+		CanLogin: data.CanLogin,
+		CanConnect: data.CanConnect,
+		CanWatch: data.CanWatch,
+		CanHost: data.CanHost,
+		CanAccessClipboard: data.CanAccessClipboard,
 	})
 
 	if err != nil {
@@ -79,46 +86,44 @@ func (h *MembersHandler) membersRead(w http.ResponseWriter, r *http.Request) {
 	member := GetMember(r)
 
 	// TODO: Join structs?
-	// TODO: Ugly.
 	utils.HttpSuccess(w, MemberDataPayload{
-		Name: func(v string) *string { return &v }(member.Name()),
-		IsAdmin: func(v bool) *bool { return &v }(member.IsAdmin()),
-		CanLogin: func(v bool) *bool { return &v }(member.CanLogin()),
-		CanConnect: func(v bool) *bool { return &v }(member.CanConnect()),
-		CanWatch: func(v bool) *bool { return &v }(member.CanWatch()),
-		CanHost: func(v bool) *bool { return &v }(member.CanHost()),
-		CanAccessClipboard: func(v bool) *bool { return &v }(member.CanAccessClipboard()),
+		Name: member.Name(),
+		IsAdmin: member.IsAdmin(),
+		CanLogin: member.CanLogin(),
+		CanConnect: member.CanConnect(),
+		CanWatch: member.CanWatch(),
+		CanHost: member.CanHost(),
+		CanAccessClipboard: member.CanAccessClipboard(),
 	})
 }
 
 func (h *MembersHandler) membersUpdate(w http.ResponseWriter, r *http.Request) {
-	data := &MemberDataPayload{}
+	member := GetMember(r)
+
+	data := &MemberDataPayload{
+		Name: member.Name(),
+		IsAdmin: member.IsAdmin(),
+		CanLogin: member.CanLogin(),
+		CanConnect: member.CanConnect(),
+		CanWatch: member.CanWatch(),
+		CanHost: member.CanHost(),
+		CanAccessClipboard: member.CanAccessClipboard(),
+	}
+
 	if !utils.HttpJsonRequest(w, r, data) {
 		return
 	}
 
-	member := GetMember(r)
-
-	secret := ""
-	if data.Secret != nil && *data.Secret != "" {
-		secret = *data.Secret
-	}
-
-	name := member.Name()
-	if data.Name != nil && *data.Name != "" {
-		name = *data.Name
-	}
-
 	// TODO: Join structs?
 	err := h.sessions.Update(member.ID(), types.MemberProfile{
-		Secret: secret,
-		Name: name,
-		IsAdmin: defaultBool(data.IsAdmin, member.IsAdmin()),
-		CanLogin: defaultBool(data.CanLogin, member.CanLogin()),
-		CanConnect: defaultBool(data.CanConnect, member.CanConnect()),
-		CanWatch: defaultBool(data.CanWatch, member.CanWatch()),
-		CanHost: defaultBool(data.CanHost, member.CanHost()),
-		CanAccessClipboard: defaultBool(data.CanAccessClipboard, member.CanAccessClipboard()),
+		Secret: data.Secret,
+		Name: data.Name,
+		IsAdmin: data.IsAdmin,
+		CanLogin: data.CanLogin,
+		CanConnect: data.CanConnect,
+		CanWatch: data.CanWatch,
+		CanHost: data.CanHost,
+		CanAccessClipboard: data.CanAccessClipboard,
 	})
 
 	if err != nil {
@@ -139,10 +144,3 @@ func (h *MembersHandler) membersDelete(w http.ResponseWriter, r *http.Request) {
 
 	utils.HttpSuccess(w)
 }
-
-func defaultBool(val *bool, def bool) bool {
-	if val != nil {
-		return *val
-	}
-	return def
-}