diff --git a/uc_roles/uc_roles.module b/uc_roles/uc_roles.module
index 10be1f7..1ec56df 100644
--- a/uc_roles/uc_roles.module
+++ b/uc_roles/uc_roles.module
@@ -652,8 +652,8 @@ function uc_roles_feature_form($form_state, $node, $feature) {
     $default_by_quantity = $product_role->by_quantity;
     if ($product_role->end_time) {
       $end_time = array(
-        'day' => date('d', $product_role->end_time),
-        'month' => date('m', $product_role->end_time),
+        'day' => date('j', $product_role->end_time),
+        'month' => date('n', $product_role->end_time),
         'year' => date('Y', $product_role->end_time),
       );
       $default_end_type = 'abs';
@@ -661,8 +661,8 @@ function uc_roles_feature_form($form_state, $node, $feature) {
     else {
       $temp = _uc_roles_get_expiration($default_qty, $default_granularity);
       $end_time = array(
-        'day' => date('d', $temp),
-        'month' => date('m', $temp),
+        'day' => date('j', $temp),
+        'month' => date('n', $temp),
         'year' => date('Y', $temp),
       );
       $default_end_type = 'rel';
@@ -687,8 +687,8 @@ function uc_roles_feature_form($form_state, $node, $feature) {
     $default_shippable = $node->shippable;
     $default_by_quantity = variable_get('uc_roles_default_by_quantity', FALSE);
     $end_time = variable_get('uc_roles_default_end_time', array(
-      'day' => date('d'),
-      'month' => date('m'),
+      'day' => date('j'),
+      'month' => date('n'),
       'year' => date('Y'),
     ));
     $default_end_type = variable_get('uc_roles_default_end_expiration', 'rel');
@@ -990,8 +990,8 @@ function uc_roles_feature_settings() {
     '#type' => 'date',
     '#description' => t('When this expiration period will end.'),
     '#default_value' => variable_get('uc_roles_default_end_time', array(
-      'day' => date('d'),
-      'month' => date('m'),
+      'day' => date('j'),
+      'month' => date('n'),
       'year' => date('Y'),
     )),
   );