diff --git a/modules/custom/wxt_ext/wxt_ext_webform/config/install/webform.webform.gcweb_report_a_problem.yml b/modules/custom/wxt_ext/wxt_ext_webform/config/install/webform.webform.gcweb_report_a_problem.yml
index e69de29..27c42c0 100644
--- a/modules/custom/wxt_ext/wxt_ext_webform/config/install/webform.webform.gcweb_report_a_problem.yml
+++ b/modules/custom/wxt_ext/wxt_ext_webform/config/install/webform.webform.gcweb_report_a_problem.yml
@@ -0,0 +1,190 @@
+langcode: en
+status: open
+dependencies: {  }
+open: null
+close: null
+weight: 0
+uid: 1
+template: false
+archive: false
+id: gcweb_report_a_problem
+title: 'GCWeb - Report a Problem'
+description: ''
+category: ''
+elements: "markup:\n  '#type': webform_markup\n  '#markup': '<legend><span class=\"field-name\">Please select all that apply:</span></legend>'\nproblem1:\n  '#type': checkbox\n  '#title': 'A link, button or video is not working'\nproblem2:\n  '#type': checkbox\n  '#title': 'It has a spelling mistake'\nproblem3:\n  '#type': checkbox\n  '#title': 'Information is missing'\nproblem4:\n  '#type': checkbox\n  '#title': 'Information is outdated or wrong'\nproblem5:\n  '#type': checkbox\n  '#title': 'Login error when trying to access an account (e.g. My Service Canada Account)'\nsub_option_container:\n  '#type': container\n  '#attributes':\n    style: 'margin-left: 40px;'\n  problem6:\n    '#type': checkbox\n    '#title': 'GC Key access'\n  problem7:\n    '#type': checkbox\n    '#title': 'SecureKey Concierge (Banking Credential) access'\n  problem8:\n    '#type': checkbox\n    '#title': 'Personal Access Code (PAC) problems or EI Access Code (AC) problems'\n  problem9:\n    '#type': checkbox\n    '#title': 'Social Insurance Number (SIN) validation problems'\n  problem10:\n    '#type': checkbox\n    '#title': 'Other login error not in this list'\nproblem11:\n  '#type': checkbox\n  '#title': 'I can''t find what I''m looking for'\nproblem12:\n  '#type': checkbox\n  '#title': 'Other issue not in this list'"
+css: ''
+javascript: ''
+settings:
+  ajax: true
+  ajax_scroll_top: ''
+  ajax_progress_type: ''
+  ajax_effect: fade
+  ajax_speed: 500
+  page: true
+  page_submit_path: ''
+  page_confirm_path: ''
+  page_theme_name: ''
+  form_title: both
+  form_submit_once: false
+  form_exception_message: ''
+  form_open_message: ''
+  form_close_message: ''
+  form_previous_submissions: true
+  form_confidential: false
+  form_confidential_message: ''
+  form_remote_addr: true
+  form_convert_anonymous: false
+  form_prepopulate: false
+  form_prepopulate_source_entity: false
+  form_prepopulate_source_entity_required: false
+  form_prepopulate_source_entity_type: ''
+  form_reset: false
+  form_disable_autocomplete: false
+  form_novalidate: false
+  form_disable_inline_errors: false
+  form_required: false
+  form_unsaved: false
+  form_disable_back: false
+  form_submit_back: false
+  form_autofocus: false
+  form_details_toggle: false
+  form_access_denied: default
+  form_access_denied_title: ''
+  form_access_denied_message: ''
+  form_access_denied_attributes: {  }
+  form_file_limit: ''
+  share: false
+  share_node: false
+  share_theme_name: ''
+  share_title: true
+  share_page_body_attributes: {  }
+  submission_label: ''
+  submission_log: false
+  submission_views: {  }
+  submission_views_replace: {  }
+  submission_user_columns: {  }
+  submission_user_duplicate: false
+  submission_access_denied: default
+  submission_access_denied_title: ''
+  submission_access_denied_message: ''
+  submission_access_denied_attributes: {  }
+  submission_exception_message: ''
+  submission_locked_message: ''
+  submission_excluded_elements: {  }
+  submission_exclude_empty: false
+  submission_exclude_empty_checkbox: false
+  previous_submission_message: ''
+  previous_submissions_message: ''
+  autofill: false
+  autofill_message: ''
+  autofill_excluded_elements: {  }
+  wizard_progress_bar: true
+  wizard_progress_pages: false
+  wizard_progress_percentage: false
+  wizard_progress_link: false
+  wizard_progress_states: false
+  wizard_auto_forward: true
+  wizard_start_label: ''
+  wizard_preview_link: false
+  wizard_confirmation: true
+  wizard_confirmation_label: ''
+  wizard_track: ''
+  wizard_prev_button_label: ''
+  wizard_next_button_label: ''
+  wizard_toggle: false
+  wizard_toggle_show_label: ''
+  wizard_toggle_hide_label: ''
+  preview: 0
+  preview_label: ''
+  preview_title: ''
+  preview_message: ''
+  preview_attributes: {  }
+  preview_excluded_elements: {  }
+  preview_exclude_empty: true
+  preview_exclude_empty_checkbox: false
+  draft: none
+  draft_multiple: false
+  draft_auto_save: false
+  draft_saved_message: ''
+  draft_loaded_message: ''
+  draft_pending_single_message: ''
+  draft_pending_multiple_message: ''
+  confirmation_type: inline
+  confirmation_title: ''
+  confirmation_message: "<h3>Thank you for your help!</h3>\r\n\r\n<p>You will not receive a reply. For enquiries, <a href=\"https://www.canada.ca/en/contact/index.html\">contact us</a>.</p>"
+  confirmation_url: ''
+  confirmation_attributes: {  }
+  confirmation_back: false
+  confirmation_back_label: ''
+  confirmation_back_attributes: {  }
+  confirmation_exclude_query: false
+  confirmation_exclude_token: false
+  confirmation_update: false
+  limit_total: null
+  limit_total_interval: null
+  limit_total_message: ''
+  limit_total_unique: false
+  limit_user: null
+  limit_user_interval: null
+  limit_user_message: ''
+  limit_user_unique: false
+  entity_limit_total: null
+  entity_limit_total_interval: null
+  entity_limit_user: null
+  entity_limit_user_interval: null
+  purge: none
+  purge_days: null
+  results_disabled: false
+  results_disabled_ignore: false
+  results_customize: false
+  token_view: false
+  token_update: false
+access:
+  create:
+    roles:
+      - anonymous
+      - authenticated
+    users: {  }
+    permissions: {  }
+  view_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  update_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  delete_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  purge_any:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  view_own:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  update_own:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  delete_own:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  administer:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  test:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+  configuration:
+    roles: {  }
+    users: {  }
+    permissions: {  }
+handlers: {  }
+variants: {  }
diff --git a/modules/custom/wxt_ext/wxt_ext_webform/src/Plugin/Block/ReportProblemBlock.php b/modules/custom/wxt_ext/wxt_ext_webform/src/Plugin/Block/ReportProblemBlock.php
index 1e221f8..609cc3e 100644
--- a/modules/custom/wxt_ext/wxt_ext_webform/src/Plugin/Block/ReportProblemBlock.php
+++ b/modules/custom/wxt_ext/wxt_ext_webform/src/Plugin/Block/ReportProblemBlock.php
@@ -88,6 +88,7 @@ public static function create(ContainerInterface $container, array $configuratio
   public function defaultConfiguration() {
     return [
       'webform_id' => '',
+      'inline_webform' => '',
     ];
   }
 
@@ -96,6 +97,12 @@ public function defaultConfiguration() {
    */
   public function blockForm($form, FormStateInterface $form_state) {
 
+    $form['inline_webform'] = [
+      '#title' => $this->t('Include inline webform (Canada.ca)'),
+      '#type' => 'checkbox',
+      '#default_value' => $this->configuration['inline_webform'],
+    ];
+
     $form['webform_id'] = [
       '#title' => $this->t('Webform'),
       '#type' => 'entity_autocomplete',
@@ -112,22 +119,43 @@ public function blockForm($form, FormStateInterface $form_state) {
    */
   public function blockSubmit($form, FormStateInterface $form_state) {
     $this->configuration['webform_id'] = $form_state->getValue('webform_id');
+    $this->configuration['inline_webform'] = $form_state->getValue('inline_webform');
   }
 
   /**
    * {@inheritdoc}
    */
   public function build() {
+    $config = \Drupal::config('block.block.reportproblemblock');
+    $inline_webform = $config->get('settings.inline_webform');
+
+    if ($inline_webform) {
+      $webform_id = $config->get('settings.webform_id');
+      $webform = \Drupal::entityTypeManager()->getStorage('webform')->load($webform_id);
+      $view_builder = \Drupal::service('entity_type.manager')->getViewBuilder('webform');
 
-    $url = $this->getWebform()->toUrl()
-      ->setOption('query', $this->requestStack->getCurrentRequest()->query->all())
-      ->toString();
-    $markup = '<a class="btn btn-default" href="' . $url . '">';
-    $markup .= '<span class="glyphicon glyphicon-play">&nbsp;</span>';
-    $markup .= $this->t('Report a problem');
-    $markup .= '</a>';
-    $build['#markup'] = $markup;
-    return $build;
+      $build = $view_builder->view($webform);
+
+      return array(
+        '#theme' => 'gcweb-inline-webform',
+        '#content' => $build,
+      );
+    }
+    else {
+      $url = $this->getWebform()->toUrl()
+        ->setOption('query', $this->requestStack->getCurrentRequest()->query->all())
+        ->toString();
+
+      $markup = '<a class="btn btn-default" href="' . $url . '">';
+      $markup .= '<span class="glyphicon glyphicon-play">&nbsp;</span>';
+      $markup .= $this->t('Report a problem');
+      $markup .= '</a>';
+
+      return [
+        '#type' => 'inline_template',
+        '#template' => $markup,
+      ];
+    }
   }
 
   /**
diff --git a/modules/custom/wxt_ext/wxt_ext_webform/wxt_ext_webform.module b/modules/custom/wxt_ext/wxt_ext_webform/wxt_ext_webform.module
index 2faa571..aaf46b6 100644
--- a/modules/custom/wxt_ext/wxt_ext_webform/wxt_ext_webform.module
+++ b/modules/custom/wxt_ext/wxt_ext_webform/wxt_ext_webform.module
@@ -4,3 +4,16 @@
  * @file
  * Contains wxt_ext_webform.module.
  */
+
+/**
+ * Implements hook_theme().
+ */
+function wxt_ext_webform_theme($existing, $type, $theme, $path) {
+  return array('gcweb-inline-webform' =>
+    array(
+      'variables' => array(
+        'content' => null,
+      ),
+    )
+  );
+}