diff --git a/controllers/store_secrets.go b/controllers/store_secrets.go
index 9b7e75e..07da1c2 100644
--- a/controllers/store_secrets.go
+++ b/controllers/store_secrets.go
@@ -13,7 +13,6 @@ import (
 
 // bindings are validated by https://github.com/go-playground/validator
 type StoreInput struct {
-	//RoleId         int    `json:"roleId"`
 	SafeId         int    `json:"safeId"`
 	SafeName       string `json:"safeName"`
 	DeviceName     string `json:"deviceName"`
diff --git a/models/secret.go b/models/secret.go
index 5de1da4..02f176c 100644
--- a/models/secret.go
+++ b/models/secret.go
@@ -60,7 +60,9 @@ func SecretsGetAllowedForGroup(s *Secret, userId int) ([]UserSecret, error) {
 	var secretResults []UserSecret
 
 	args := []interface{}{}
-	query := `SELECT users.UserId, users.GroupId, permissions.ReadOnly, permissions.SafeId, safes.SafeName, secrets.* FROM users
+	query := `SELECT users.UserId, users.GroupId, permissions.ReadOnly, permissions.SafeId, safes.SafeName, 
+	secrets.SecretId, secrets.SafeId, secrets.DeviceName, secrets.DeviceCategory, secrets.UserName AS SecretUser, secrets.Secret
+	FROM users
 	INNER JOIN groups ON users.GroupId = groups.GroupId
 	INNER JOIN permissions ON groups.GroupId = permissions.GroupId
 	INNER JOIN safes on permissions.SafeId = safes.SafeId