diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 58c87be19..745f9ae23 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -41,6 +41,7 @@
             debug("connected...");
             };
           });
+  = javascript_include_tag 'satisfaction' 
   %body
     - flash.each do |name, msg|
       = content_tag :div, msg, :id => "flash_#{name}"
@@ -50,13 +51,13 @@
         %a#diaspora_text{:href => root_path}
           %img{:src => '/images/diaspora_white.png'}
 
-          #session_action
-            - if user_signed_in?
-              =User.first.email
-              |
-              = link_to "logout", destroy_user_session_path
-            - else
-              = link_to "login", new_user_session_path
+        #session_action
+          - if user_signed_in?
+            =User.first.email
+            |
+            = link_to "logout", destroy_user_session_path
+          - else
+            = link_to "login", new_user_session_path
 
     #header_below
       .container
diff --git a/public/javascripts/google.js b/public/javascripts/google.js
index 2ea0010bb..3c01e09b6 100644
--- a/public/javascripts/google.js
+++ b/public/javascripts/google.js
@@ -1,5 +1,3 @@
-<script type="text/javascript">
-
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', 'UA-17207587-1']);
   _gaq.push(['_setDomainName', '.joindiaspora.com']);
@@ -10,5 +8,3 @@
     ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   })();
-
-</script>
diff --git a/public/javascripts/satisfaction.js b/public/javascripts/satisfaction.js
new file mode 100644
index 000000000..16dcf52e8
--- /dev/null
+++ b/public/javascripts/satisfaction.js
@@ -0,0 +1,14 @@
+  var is_ssl = ("https:" == document.location.protocol);
+  var asset_host = is_ssl ? "https://s3.amazonaws.com/getsatisfaction.com/" : "http://s3.amazonaws.com/getsatisfaction.com/";
+  document.write(unescape("%3Cscript src='" + asset_host + "javascripts/feedback-v2.js' type='text/javascript'%3E%3C/script%3E"));
+  
+  var feedback_widget_options = {};
+
+  feedback_widget_options.display = "inline";  
+  feedback_widget_options.company = "diaspora";
+  feedback_widget_options.placement = "left";
+  feedback_widget_options.color = "#222";
+  feedback_widget_options.style = "idea";
+  
+
+  var feedback_widget = new GSFN.feedback_widget(feedback_widget_options);