diff --git a/src/Service/Janrain.php b/src/Service/Janrain.php
index 6fa9838..df13ef3 100644
--- a/src/Service/Janrain.php
+++ b/src/Service/Janrain.php
@@ -45,7 +45,13 @@ class Janrain {
   /**
    * Function to get Form Data.
    */
-  public function getFormData($form_id) {
+  public function getFormData($form_id, $full_response = FALSE) {
+
+    $form_data = [];
+    $fields = FALSE;
+    $field_data = FALSE;
+    $action = FALSE;
+    $next = FALSE;
 
     $config = $this->configFactory->get('janrain.settings');
     $yml_path = $config->get('yml_path');
@@ -75,7 +81,37 @@ class Janrain {
       return FALSE;
     }
 
-    $form_data = $flow_data;
+    if (empty($flow_data['fields'][$form_id])) {
+      return FALSE;
+    }
+
+    if (!empty($flow_data['fields'][$form_id]['fields'])) {
+      $fields = $flow_data['fields'][$form_id]['fields'];
+    }
+
+    if (!empty($flow_data['fields'][$form_id]['action'])) {
+      $action = $flow_data['fields'][$form_id]['action'];
+    }
+
+    if (!empty($flow_data['fields'][$form_id]['next'])) {
+      $next = $flow_data['fields'][$form_id]['next'];
+    }
+
+    $field_data = [];
+    foreach ($fields as $field) {
+      $field_data[$field] = $flow_data['fields'][$field];
+    }
+
+    $form_data = [
+      'form_id' => $form_id,
+      'fields' => $fields,
+      'field_data' => $field_data,
+    ];
+
+    if ($full_response) {
+      $form_data['action'] = $action;
+      $form_data['next'] = $next;
+    }
 
     return $form_data;
   }