diff --git a/app/views/shared/_invitations.haml b/app/views/shared/_invitations.haml
index 86a50c2cbbb004790ce956d6eae7c35284c9acc4..b82cca1041d87a73dbb17f4b7229fd77943f50d7 100644
--- a/app/views/shared/_invitations.haml
+++ b/app/views/shared/_invitations.haml
@@ -1,6 +1,6 @@
 - unless @aspect == :all
   %h4 Invites
-  = link_to "Invite a friend", "#invite_user_pane", :class => "invite_user_button", :class => "invite_user_button", :title => "Invite a friend"
+  = link_to "Invite a friend", "#invite_user_pane", :class => "invite_user_button", :title => "Invite a friend"
   = "(#{invites} left)"
   %br
   .yo{ :style => "display:none;"}
diff --git a/app/views/shared/_public_explain.haml b/app/views/shared/_public_explain.haml
new file mode 100644
index 0000000000000000000000000000000000000000..568f4d88429809c5b2c3cda73e35162b16387aa1
--- /dev/null
+++ b/app/views/shared/_public_explain.haml
@@ -0,0 +1,9 @@
+%h1 you are about to post a public message!
+%p 
+  this message is going to be posted to your public feed, 
+  and to any services you may have connected to Diaspora.
+
+  - if @logged_in
+    = connected_fb_as(@access_token)
+  - else
+    = link_to "Connect to Facebook", @fb_access_url
diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml
index b514a5e1e1bb4d738ff77f0cd04cef244980edad..c1886b5fbdf34dc2344d0dcbee4870ddbbfaeb10 100644
--- a/app/views/shared/_publisher.haml
+++ b/app/views/shared/_publisher.haml
@@ -35,7 +35,10 @@
       .public_toggle
         = f.check_box( :public, :value => false )
         share on facebook
-
+        = link_to 'public info', "#question_mark_pane", :class => 'question_mark'
+        .yo{:style => "display:none;"}
+          #question_mark_pane
+            = render 'shared/public_explain'
     .buttons
       - if @aspect == :all
         = f.submit t('.share'), :title => "Share with all aspects"
diff --git a/app/views/users/_services.haml b/app/views/users/_services.haml
index 80cf3366331b927c99d7bdae6d22e136073d6127..a9a6d7977b5b78a020e070f95cb66c7e40dde9af 100644
--- a/app/views/users/_services.haml
+++ b/app/views/users/_services.haml
@@ -18,7 +18,7 @@
 
       = link_to "Disconnect from Facebook", services_destroy_path
     - else
-      = link_to "Connect to Facebook (DO NOT USE WITH A REAL ACCOUNT)", @fb_access_url
+      = link_to "Connect to Facebook", @fb_access_url
 
   #content_bottom
     .back
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 94874358befd2c1b47f303a5086d2c3aa3bf52fc..dec170a07b1209cd3fe134d170cb21d0142e465f 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -30,6 +30,7 @@ $(document).ready(function(){
   $(".add_request_button").fancybox({ 'titleShow': false });
   $(".invite_user_button").fancybox({ 'titleShow': false });
   $(".add_request_button").fancybox({ 'titleShow': false });
+  $(".question_mark").fancybox({ 'titleShow': false });
 
   $("input[type='submit']").addClass("button");