diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index eeaf19433..7174b84e4 100644
--- a/app/helpers/sockets_helper.rb
+++ b/app/helpers/sockets_helper.rb
@@ -59,7 +59,7 @@ module SocketsHelper
         raise "#{object.inspect} with class #{object.class} is not actionhashable." unless object.is_a? Retraction
       end
     rescue Exception => e
-      Rails.logger.error("event=socket_render status=fail user=#{user.diaspora_handle} object=#{object.id.to_s}")
+      Rails.logger.error(:event => :socket_render, :status => :fail, :user => user.diaspora_handle, :object=> object.id, :object_class => object.class)
       raise e
     end
     action_hash = {:class =>object.class.to_s.underscore.pluralize, :html => v, :post_id => obj_id(object)}
diff --git a/app/views/notifications/_popup.haml b/app/views/notifications/_popup.haml
index 9bb8f36bb..a3689ced0 100644
--- a/app/views/notifications/_popup.haml
+++ b/app/views/notifications/_popup.haml
@@ -3,5 +3,4 @@
 -#   the COPYRIGHT file.
 .notification
   = person_image_tag(person)
-  = link_to "#{person.name.titleize}", person_path(person.id)
-  = object_link(note)
+  = notification_message_for(note)