diff --git a/app/assets/javascripts/vendor/jquery-linkify.min.js b/app/assets/javascripts/vendor/jquery-linkify.min.js
new file mode 100644
index 0000000..5f7f615
--- /dev/null
+++ b/app/assets/javascripts/vendor/jquery-linkify.min.js
@@ -0,0 +1 @@
+function linkify(a,b){a=a.replace(/(http|https|ftp)\:\/\/[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,3}(:[a-zA-Z0-9]*)?\/?([a-zA-Z0-9\-\._\?\,\'\/\\\+&amp;%\$#\=~])*/g,'<a href="$&">$&</a>');b&&(a=a.replace(/\B#(\w+)/g,"<a href="+b("$1")+">#$1</a>"));return a}(function(a){a.fn.linkify=function(b){return this.each(function(){var c=a(this);c.html(linkify(c.html(),b))})}})(jQuery);
\ No newline at end of file
diff --git a/app/views/asciicasts/show.html.erb b/app/views/asciicasts/show.html.erb
index 520f50e..e920d19 100644
--- a/app/views/asciicasts/show.html.erb
+++ b/app/views/asciicasts/show.html.erb
@@ -1,8 +1,8 @@
 <div class="page-header asciicast-heading">
   <h1>
-    <%= asciicast_title(@asciicast) %>
+    <span class="title"><%= asciicast_title(@asciicast) %></span>
 
-    <% if @asciicast.user == current_user %>
+    <% if current_user && @asciicast.user == current_user %>
       <% if @asciicast.title.blank? %>
         <%= link_to 'Add a title', edit_asciicast_path(@asciicast, :anchor => 'focus-title'),
                     :class => 'edit-title' %>
@@ -22,7 +22,7 @@
 
 <%= render :partial => 'asciicasts/asciicast', :object => @asciicast %>
 
-<% if @asciicast.user == current_user %>
+<% if current_user && @asciicast.user == current_user %>
   <% if @asciicast.description.blank? %>
     <%= link_to 'Add a description', edit_asciicast_path(@asciicast, :anchor => 'focus-desc'),
                 :class => 'edit-description' %>
@@ -67,4 +67,8 @@
 
     new AsciiIo.Views.CommentsIndex({ collection: comments });
   });
+
+  $(function() {
+    $('.asciicast .description, .asciicast-heading .title').linkify();
+  });
 </script>