diff --git a/src/invidious.cr b/src/invidious.cr
index 009e59df..96e1eb65 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -273,6 +273,15 @@ get "/search" do |env|
         end
       end
 
+      author = root.xpath_node(%q(div[@class="yt-lockup-content"]/div/a))
+      if author
+        video["author"] = author.content
+        video["author_url"] = author["href"]
+      else
+        video["author"] = ""
+        video["author_url"] = ""
+      end
+
       videos << video
     end
   end
diff --git a/src/views/index.ecr b/src/views/index.ecr
index 3b061fa1..843ceefb 100644
--- a/src/views/index.ecr
+++ b/src/views/index.ecr
@@ -10,8 +10,9 @@
         <div style="margin:1em;">
             <a style="width:100%;" class="link" href="/watch?v=<%= video.id %>">
                 <img style="width:100%;" src="<%= player_response["videoDetails"]["thumbnail"]["thumbnails"][0]["url"] %>"/>
-                <%= video.title %>
+                <p><%= video.title %></p>
             </a>
+            <p><b><a style="width:100%;" class="link" href="https://youtube.com/channel/<%= video.info["ucid"] %>"><%= video.info["author"] %></a></b></p>
         </div>
     </div>
     <% end %>
diff --git a/src/views/search.ecr b/src/views/search.ecr
index 105e25af..4ed6f408 100644
--- a/src/views/search.ecr
+++ b/src/views/search.ecr
@@ -11,6 +11,7 @@
                 <img style="width:100%;" src="<%= video["thumbnail"] %>"/>
                 <%= video["title"] %>
             </a>
+            <p><b><a style="width:100%;" class="link" href="<%= video["author_url"]%>"><%= video["author"] %></a></b></p>
         </div>
     </div>
     <% end %>
diff --git a/src/views/watch.ecr b/src/views/watch.ecr
index ee2b0345..28f57203 100644
--- a/src/views/watch.ecr
+++ b/src/views/watch.ecr
@@ -101,7 +101,8 @@ var player = videojs('player', options, function() {
         <% if rv.has_key?("id") %>
         <a class="link" href="/watch?v=<%= rv["id"] %>">
             <img style="width:100%;" alt="thumbnail" src="<%= rv["iurlmq"] %>">
-            <%= rv["title"] %>
+            <p style="width:100%"><%= rv["title"] %></p>
+            <p><b style="width: 100%"><%= rv["author"] %></b></p>
         </a>
         <% end %>
     <% end %>