diff --git a/pkg/api/handle_tag.go b/pkg/api/handle_tag.go
index c2dc47c..79838e4 100644
--- a/pkg/api/handle_tag.go
+++ b/pkg/api/handle_tag.go
@@ -8,7 +8,7 @@ import (
 )
 
 type getTagsResponse struct {
-	Tags []database.Tag `json:"tags"`
+	Tags []*database.Tag `json:"tags"`
 }
 
 func (api *API) HandleGetTags(w http.ResponseWriter, r *http.Request) {
@@ -48,6 +48,12 @@ func (api *API) HandleInsertTag(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	req.CreatedByUserId, err = api.GetUserID(w, r)
+	if err != nil {
+		api.HandleError(w, r, err)
+		return
+	}
+
 	tag, err := api.Db.InsertTag(req)
 	if err != nil {
 		api.HandleError(w, r, err)
diff --git a/pkg/api/handle_user.go b/pkg/api/handle_user.go
index a120f99..80e6c32 100644
--- a/pkg/api/handle_user.go
+++ b/pkg/api/handle_user.go
@@ -163,3 +163,13 @@ func (api *API) CheckAdmin(w http.ResponseWriter, r *http.Request) error {
 	w.WriteHeader(http.StatusOK)
 	return nil
 }
+
+func (api *API) GetUserID(w http.ResponseWriter, r *http.Request) (int64, error) {
+	session, _ := api.store.Get(r, api.defaultSessionName)
+	userId, ok := session.Values["userId"]
+	if !ok {
+		return 0, ErrNotLoggedIn
+	}
+
+	return userId.(int64), nil
+}
diff --git a/pkg/database/method_tag.go b/pkg/database/method_tag.go
index 158e636..a07bc4e 100644
--- a/pkg/database/method_tag.go
+++ b/pkg/database/method_tag.go
@@ -15,24 +15,29 @@ func (database *Database) InsertTag(tag *Tag) (*Tag, error) {
 }
 
 func (database *Database) GetTag(id int64) (*Tag, error) {
-	tag := &Tag{}
-	err := database.stmt.getTag.QueryRow(id).Scan(&tag.ID, &tag.Name, &tag.Description)
+	tag := &Tag{CreatedByUser: &User{}}
+	err := database.stmt.getTag.QueryRow(id).Scan(
+		&tag.ID, &tag.Name, &tag.Description,
+		&tag.CreatedByUser.ID, &tag.CreatedByUser.Username, &tag.CreatedByUser.Role, &tag.CreatedByUser.AvatarId)
 	if err != nil {
 		return nil, err
 	}
 	return tag, nil
 }
 
-func (database *Database) GetTags() ([]Tag, error) {
-	tags := []Tag{}
+func (database *Database) GetTags() ([]*Tag, error) {
+	tags := []*Tag{}
 	rows, err := database.stmt.getTags.Query()
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
 	for rows.Next() {
-		tag := Tag{}
-		err := rows.Scan(&tag.ID, &tag.Name, &tag.Description)
+		tag := &Tag{CreatedByUser: &User{}}
+		err := rows.Scan(
+			&tag.ID, &tag.Name, &tag.Description,
+			&tag.CreatedByUser.ID, &tag.CreatedByUser.Username, &tag.CreatedByUser.Role, &tag.CreatedByUser.AvatarId)
+
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/database/sql_stmt.go b/pkg/database/sql_stmt.go
index 14c6781..2c16e79 100644
--- a/pkg/database/sql_stmt.go
+++ b/pkg/database/sql_stmt.go
@@ -174,9 +174,19 @@ var getAnonymousUserQuery = `SELECT id, username, role, avatar_id FROM users WHE
 
 var insertTagQuery = `INSERT INTO tags (name, description, created_by_user_id) VALUES (?, ?, ?);`
 
-var getTagQuery = `SELECT id, name, description FROM tags WHERE id = ? LIMIT 1;`
+var getTagQuery = `SELECT
+tags.id, tags.name, tags.description,
+users.id, users.username, users.role, users.avatar_id
+FROM tags
+JOIN users ON tags.created_by_user_id = users.id
+WHERE tags.id = ? LIMIT 1;`
 
-var getTagsQuery = `SELECT id, name, description FROM tags;`
+var getTagsQuery = `SELECT
+tags.id, tags.name, tags.description,
+users.id, users.username, users.role, users.avatar_id
+FROM tags
+JOIN users ON tags.created_by_user_id = users.id
+;`
 
 var updateTagQuery = `UPDATE tags SET name = ?, description = ? WHERE id = ?;`
 
diff --git a/pkg/database/struct.go b/pkg/database/struct.go
index 068fe78..f7d7c92 100644
--- a/pkg/database/struct.go
+++ b/pkg/database/struct.go
@@ -33,6 +33,7 @@ type Tag struct {
 	Name            string `json:"name"`
 	Description     string `json:"description"`
 	CreatedByUserId int64  `json:"created_by_user_id"`
+	CreatedByUser   *User   `json:"created_by_user"`
 }
 
 var (
diff --git a/web/src/component/EditTag.js b/web/src/component/EditTag.js
index e5e9de4..6674a39 100644
--- a/web/src/component/EditTag.js
+++ b/web/src/component/EditTag.js
@@ -7,6 +7,12 @@ function EditTag() {
     id: "",
     name: "",
     description: "",
+    created_by_user: {
+      id: "",
+      username: "",
+      role: "",
+      avatar_id: "",
+    },
   });
 
   function refreshTagInfo() {
@@ -69,6 +75,23 @@ function EditTag() {
           value={tag.id}
           onChange={(e) => setTag({ ...tag, id: e.target.value })}
         />
+        <label htmlFor="name">Created By</label>
+        <input
+          type="text"
+          disabled
+          name="created_by_user_username"
+          id="created_by_user_username"
+          value={tag.created_by_user.username}
+          onChange={(e) =>
+            setTag({
+              ...tag,
+              created_by_user: {
+                ...tag.created_by_user,
+                username: e.target.value,
+              },
+            })
+          }
+        />
         <label htmlFor="name">Name</label>
         <input
           type="text"
diff --git a/web/src/component/Tags.js b/web/src/component/Tags.js
index 6930d16..f909bc2 100644
--- a/web/src/component/Tags.js
+++ b/web/src/component/Tags.js
@@ -31,6 +31,7 @@ function Tags() {
           <tr>
             <th>Name</th>
             <th>Description</th>
+            <th>Created By</th>
             <th>Actions</th>
           </tr>
         </thead>
@@ -39,6 +40,7 @@ function Tags() {
             <tr key={tag.id}>
               <td>{tag.name}</td>
               <td>{tag.description}</td>
+              <td>{tag.created_by_user.username}</td>
               <td>
                 <Link to={`/manage/tags/${tag.id}`}>Edit</Link>
               </td>