diff --git a/model/user_accessors.go b/model/user_accessors.go
index 758c961a..a6c9972a 100644
--- a/model/user_accessors.go
+++ b/model/user_accessors.go
@@ -36,7 +36,7 @@ func UserSchema() schema.Element {
 			"isOwner":        schema.Boolean{},
 			"isIndexable":    schema.Boolean{},
 			"data":           schema.Object{Wildcard: schema.String{}},
-			"tags":           schema.Array{Items: schema.String{}},
+			"tags":           schema.Array{Items: TagSchema()},
 		},
 	}
 }
diff --git a/model/user_test.go b/model/user_test.go
index 4f735a24..3b7827ae 100644
--- a/model/user_test.go
+++ b/model/user_test.go
@@ -38,9 +38,9 @@ func TestUserSchema(t *testing.T) {
 		{"isIndexable", "true", true},
 		{"inboxTemplate", "INBOX", nil},
 		{"outboxTemplate", "OUTBOX", nil},
-		{"tags.0", "HEy", nil},
-		{"tags.1", "ThErE", nil},
-		{"tags.2", "bItChEs", nil},
+		{"tags.0.name", "HEy", nil},
+		{"tags.1.name", "ThErE", nil},
+		{"tags.2.name", "bItChEs", nil},
 	}
 
 	tableTest_Schema(t, &s, &user, tests)