diff --git a/modules/promotion/commerce_promotion.routing.yml b/modules/promotion/commerce_promotion.routing.yml
index 329e022..594ae95 100644
--- a/modules/promotion/commerce_promotion.routing.yml
+++ b/modules/promotion/commerce_promotion.routing.yml
@@ -17,6 +17,7 @@ entity.commerce_promotion_coupon.generate_form:
     _form: '\Drupal\commerce_promotion\Form\CouponGenerateForm'
     _title: 'Generate coupons'
   options:
+    _admin_route: TRUE
     parameters:
       commerce_promotion:
         type: 'entity:commerce_promotion'
diff --git a/modules/promotion/src/Form/CouponGenerateForm.php b/modules/promotion/src/Form/CouponGenerateForm.php
index 3dd90b8..307390a 100644
--- a/modules/promotion/src/Form/CouponGenerateForm.php
+++ b/modules/promotion/src/Form/CouponGenerateForm.php
@@ -21,6 +21,11 @@ class CouponGenerateForm extends FormBase {
   const PASS_COUNT = 25;
 
   /**
+   * The maximum number of coupons to generate.
+   */
+  const COUPON_COUNT = 1000;
+
+  /**
    * The coupon code generator.
    *
    * @var \Drupal\commerce_promotion\CouponCodeGeneratorInterface
@@ -84,57 +89,48 @@ class CouponGenerateForm extends FormBase {
 
     $form['coupon_quantity'] = [
       '#type' => 'number',
-      '#title' => $this->t('Number of coupons to generate?'),
+      '#title' => $this->t('Number of coupons'),
       '#required' => TRUE,
+      '#default_value' => '10',
       '#min' => 1,
-      '#max' => 1000,
       '#step' => 1,
     ];
     $form['coupon_code_pattern'] = [
       '#type' => 'fieldset',
       '#title' => $this->t('Coupon code pattern'),
     ];
-    $form['coupon_code_pattern']['prefix'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Code prefix'),
-      '#size' => 20,
-    ];
-    $form['coupon_code_pattern']['suffix'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Code suffix'),
-      '#size' => 20,
-    ];
     $form['coupon_code_pattern']['format'] = [
       '#type' => 'select',
-      '#title' => $this->t('Code format'),
+      '#title' => $this->t('Format'),
       '#required' => TRUE,
       '#options' => [
         'alphanumeric' => $this->t('Alphanumeric'),
         'alphabetic' => $this->t('Alphabetic'),
         'numeric' => $this->t('Numeric'),
       ],
+      '#default_value' => 'alphanumeric',
+    ];
+    $form['coupon_code_pattern']['prefix'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Prefix'),
+      '#size' => 20,
+    ];
+    $form['coupon_code_pattern']['suffix'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Suffix'),
+      '#size' => 20,
     ];
     $form['coupon_code_pattern']['length'] = [
       '#type' => 'number',
-      '#title' => $this->t('Code length'),
-      '#description' => $this->t('Code length does not include prefix/suffix.'),
+      '#title' => $this->t('Length'),
+      '#description' => $this->t('Length does not include prefix/suffix.'),
       '#required' => TRUE,
       '#default_value' => 8,
       '#min' => 1,
     ];
-    $form['status'] = [
-      '#type' => 'radios',
-      '#title' => $this->t('Status'),
-      '#options' => [
-        0 => $this->t('Disabled'),
-        1 => $this->t('Enabled'),
-      ],
-      '#default_value' => 1,
-      '#required' => TRUE,
-    ];
     $form['limit'] = [
       '#type' => 'radios',
-      '#title' => $this->t('Total available'),
+      '#title' => $this->t('Number of uses per coupon'),
       '#options' => [
         0 => $this->t('Unlimited'),
         1 => $this->t('Limited number of uses'),
@@ -169,6 +165,11 @@ class CouponGenerateForm extends FormBase {
   public function validateForm(array &$form, FormStateInterface $form_state) {
     $values = $form_state->getValues();
 
+    // Validate maximum coupon quantity.
+    if ($values['coupon_quantity'] > self::COUPON_COUNT) {
+      $form_state->setError($form['coupon_quantity'], $this->t('Number of coupons must be less than or equal to @max_length.', ['@max_length' => self::COUPON_COUNT]));
+    }
+
     // Validate coupon code length.
     $coupon_length = strlen($values['prefix']) + strlen($values['suffix']) + $values['length'];
     if ($coupon_length > $this->maxCodeLength) {
@@ -197,7 +198,6 @@ class CouponGenerateForm extends FormBase {
     $coupon_values = [
       'promotion_id' => $this->promotion->id(),
       'usage_limit' => $values['usage_limit'],
-      'status' => $values['status'],
     ];
     $pattern = new CouponCodePattern($values['format'], $values['prefix'], $values['suffix'], $values['length']);
 
@@ -232,13 +232,13 @@ class CouponGenerateForm extends FormBase {
         drupal_set_message(t('Generated %created of %total %label. Please consider adding a unique prefix/suffix or increasing the pattern length to improve results.', [
           '%created' => $created,
           '%total' => $results['total_quantity'],
-          '%label' => ($results['total_quantity'] == 1) ? 'coupon' : 'coupons',
+          '%label' => ($results['total_quantity'] == 1) ? t('coupon') : t('coupons'),
         ]), 'error');
       }
       // Fully successful operation.
       else {
         drupal_set_message(t('Generated %created %label.', [
-          '%label' => ($created == 1) ? 'coupon' : 'coupons',
+          '%label' => ($created == 1) ? t('coupon') : t('coupons'),
           '%created' => $created,
         ]));
       }
@@ -285,7 +285,6 @@ class CouponGenerateForm extends FormBase {
       ->create([
         'promotion_id' => $coupon_values['promotion_id'],
         'usage_limit' => $coupon_values['usage_limit'],
-        'status' => $coupon_values['status'],
       ]
     );