diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index 0db759119..68fdff578 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -72,7 +72,7 @@
 
         - if commenting_disabled?(post)
           %span.federated_person{:title => "#{t('.federated_account')}"}
-            =t('.currently_unavailable')
+            ="[#{t('.currently_unavailable')}]"
         - else
           %span.like_action
             = like_action(post, current_user)
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index e67c65297..549d350f0 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -777,7 +777,7 @@ en:
     stream_element:
       viewable_to_anyone: "This post is viewable to anyone on the web"
       federated_account: "Remote users who you are not connected to can not currently receive your likes and comments"
-      currently_unavailable: 'currently unavailable'
+      currently_unavailable: 'commenting currently unavailable'
       via: "via %{link}"
       hide_and_mute: "Hide and Mute"
       like: "Like"
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 7875575f8..6b0e235e9 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -122,6 +122,13 @@ var View = {
       }
     },
 
+    commenting_disabled: {
+      bind: function() {
+        $('.federated_person').twipsy({
+          live: true
+        });
+      }
+    },
     contacts_on_side: {
       bind: function() {
         $("#selected_aspect_contacts .avatar").twipsy({