diff --git a/commerce_amazon_lpa.module b/commerce_amazon_lpa.module
index 55da9f9..dff454b 100644
--- a/commerce_amazon_lpa.module
+++ b/commerce_amazon_lpa.module
@@ -100,7 +100,16 @@ function commerce_amazon_lpa_form_user_login_form_alter(&$form, FormStateInterfa
  * Implements hook_form_alter().
  */
 function commerce_amazon_lpa_form_alter(&$form, FormStateInterface $form_state, $form_id) {
-  if ($form_state->getFormObject() instanceof ViewsForm) {
+  if ($form_id == 'commerce_checkout_flow_add_form') {
+    if(isset($form['plugin']['#options']['amazon_pay'])) {
+      unset($form['plugin']['#options']['amazon_pay']);
+      $form['plugin']['#default_value'] = key($form['plugin']['#options']);
+    }
+  }
+  else if ($form_id == 'commerce_checkout_flow_edit_form') {
+    $form['plugin']['#access'] = FALSE;
+  }
+  else if ($form_state->getFormObject() instanceof ViewsForm) {
     /** @var \Drupal\views\ViewExecutable $view */
     $view = reset($form_state->getBuildInfo()['args']);
     // Only add the Checkout button if the cart form view has order items.
diff --git a/src/Plugin/Commerce/CheckoutFlow/AmazonPay.php b/src/Plugin/Commerce/CheckoutFlow/AmazonPay.php
index e2f0450..0361dba 100644
--- a/src/Plugin/Commerce/CheckoutFlow/AmazonPay.php
+++ b/src/Plugin/Commerce/CheckoutFlow/AmazonPay.php
@@ -178,6 +178,7 @@ class AmazonPay extends CheckoutFlowBase {
           $this->amazonPay->confirmOrderReference($this->order);
         }
         catch (\Exception $e) {
+          drupal_set_message($e->getMessage(), 'error');
           $this->redirectToStep('order_information');
         }