diff --git a/gigya.behaviors.js b/gigya.behaviors.js
index 1d75e5b..8fc0895 100644
--- a/gigya.behaviors.js
+++ b/gigya.behaviors.js
@@ -37,16 +37,22 @@ Drupal.behaviors.gigyaInit = function (context) {
   }
 
   // Call ShareUI if it exists.
-    if (Drupal.settings.gigya.shareUIParams !== undefined) {
-      $('#btnShare').click( function (e) {
-        e.perventDefault;
+  if (Drupal.settings.gigya.shareUIParams !== undefined) {
+    $.each(Drupal.settings.gigya.shareUIParams, function (index, shareUIParams) {
+      var img = $('meta[property="og:image"]').attr('content');
+      if (img) {
+        var media = { type: 'image', src: img, href: Drupal.settings.gigya.shareUIParams[index].userAction.link_back};
+        Drupal.settings.gigya.shareUIParams[index].userAction.media_item = media;
+      }
+      else {
         var imgs = $('.node img');
         if (imgs.size() > 1) {
-          var media = { type: 'image', src: imgs[0].src, href: imgs[0].baseURI};
-          Drupal.settings.gigya.shareUIParams.userAction.media_item = media;
-          }
-        Drupal.gigya.showShareUI(Drupal.settings.gigya.shareUIParams);
-        });
+          var media = { type: 'image', src: imgs[0].src, href: Drupal.settings.gigya.shareUIParams[index].userAction.link_back};
+          Drupal.settings.gigya.shareUIParams[index].userAction.media_item = media;
+        }
       }
+      Drupal.gigya.showShareUI(Drupal.settings.gigya.shareUIParams[index]);
+    });
+  }
 
 }
diff --git a/gigya.js b/gigya.js
index 08929a8..5890ff0 100644
--- a/gigya.js
+++ b/gigya.js
@@ -173,42 +173,44 @@ Drupal.gigya.showShareUI = function (shareUIParams) {
  * Undocumented Code!
  */
 Drupal.gigya.buildUserAction = function (userActionParams) {
-  var act = new gigya.services.socialize.UserAction();
-  $.each(userActionParams, function (index, value) {
-    switch (index) {
-    case 'user_message':
-      act.setUserMessage(value);
-      break;
-    case 'title':
-      act.setTitle(value);
-      break;
-    case 'description':
-      act.setDescription(value);
-      break;
-    case 'link_back':
-      act.setLinkBack(value);
-      break;
-    case 'template':
-      act.setTemplate(value);
-      break;
-    case 'action_name':
-      act.setActionName(value);
-      break;
-    case 'action_links':
-      $.each(value, function (action_index, action_item) {
-        act.addActionLink(action_item.title, action_item.href);
-      });
-      break;
-    case 'template_fields':
-      $.each(value, function (template_field_index, template_field_item) {
-        act.setTemplateField(template_field_item.field_name, template_field_item.text, template_field_item.href);
-      });
-      break;
-    case 'media_item':
-      act.addMediaItem(value);
-      break;
-    }
+  if (typeof(userActionParams) !== 'undefined') {
+    var act = new gigya.services.socialize.UserAction();
+    $.each(userActionParams, function (index, value) {
+      switch (index) {
+      case 'user_message':
+        act.setUserMessage(value);
+        break;
+      case 'title':
+        act.setTitle(value);
+        break;
+      case 'description':
+        act.setDescription(value);
+        break;
+      case 'link_back':
+        act.setLinkBack(value);
+        break;
+      case 'template':
+        act.setTemplate(value);
+        break;
+      case 'action_name':
+        act.setActionName(value);
+        break;
+      case 'action_links':
+        $.each(value, function (action_index, action_item) {
+          act.addActionLink(action_item.title, action_item.href);
+        });
+        break;
+      case 'template_fields':
+        $.each(value, function (template_field_index, template_field_item) {
+          act.setTemplateField(template_field_item.field_name, template_field_item.text, template_field_item.href);
+        });
+        break;
+      case 'media_item':
+        act.addMediaItem(value);
+        break;
+      }
 
-  });
-  return act;
+    });
+    return act;
+  }
 }
diff --git a/gigya.module b/gigya.module
index 58efdba..2031b66 100644
--- a/gigya.module
+++ b/gigya.module
@@ -1534,11 +1534,11 @@ class GigyaUser{
  */
 function gigya_shareui_js($share) {
   static $index = 0;
-//dsm($share);
+
   // Allow modules to alter the object before adding the JS to the page.
   drupal_alter('gigya_shareui', $share);
 
-  //drupal_add_js(array('gigya' => array('shareUIParams' => array($index => $share['shareui_params']))), 'setting');
+  drupal_add_js(array('gigya' => array('shareUIParams' => array($index => $share['shareui_params']))), 'setting');
 
   $index++;
 }