diff --git a/modules/payment/includes/commerce_payment.credit_card.inc b/modules/payment/includes/commerce_payment.credit_card.inc
index f57f6dc..aeae7c5 100644
--- a/modules/payment/includes/commerce_payment.credit_card.inc
+++ b/modules/payment/includes/commerce_payment.credit_card.inc
@@ -100,7 +100,7 @@ function commerce_payment_credit_card_form($fields = array(), $default = array()
     $options = array();
 
     for ($i = -10; $i < 1; $i++) {
-      $options[$current_year_4 + $i] = $current_year_2 + $i;
+      $options[$current_year_4 + $i] = str_pad($current_year_2 + $i, 2, '0', STR_PAD_LEFT);
     }
 
     $form['credit_card']['start_year'] = array(
@@ -126,7 +126,7 @@ function commerce_payment_credit_card_form($fields = array(), $default = array()
   $options = array();
 
   for ($i = 0; $i < 20; $i++) {
-    $options[$current_year_4 + $i] = $current_year_2 + $i;
+    $options[$current_year_4 + $i] = str_pad($current_year_2 + $i, 2, '0', STR_PAD_LEFT);
   }
 
   $form['credit_card']['exp_year'] = array(