diff --git a/models/secret.go b/models/secret.go
index 2b0c746..4c51151 100644
--- a/models/secret.go
+++ b/models/secret.go
@@ -27,12 +27,10 @@ type Secret struct {
 
 // Used for querying all secrets the user has access to
 type UserSecret struct {
-	UserId  int `db:"UserId" json:"userId"`
-	GroupId int `db:"GroupId" json:"groupId"`
+	User
 	Secret
 	Group
 	Permission
-	PermissionSafeId int `db:"PermSafeId"`
 }
 
 const nonceSize = 12
@@ -103,7 +101,7 @@ func SecretsGetAllowed(s *Secret, userId int) ([]UserSecret, error) {
 
 	// Query for group access
 	queryArgs := []interface{}{}
-	query := `SELECT users.UserId, users.GroupId, permissions.ReadOnly, permissions.SafeId AS PermSafeId,
+	query := `SELECT users.*, permissions.ReadOnly,
 	secrets.SecretId, secrets.SafeId, secrets.DeviceName, secrets.DeviceCategory, secrets.UserName, secrets.Secret
 	FROM users
 	INNER JOIN groups ON users.GroupId = groups.GroupId