diff --git a/lib/Form/Block/Date.php b/lib/Form/Block/Date.php
index fce6dfc474..4d6b27a349 100644
--- a/lib/Form/Block/Date.php
+++ b/lib/Form/Block/Date.php
@@ -47,20 +47,20 @@ class Date extends Base {
           $year = (isset($value[0]) ? (int)$value[0] : null);
           $month = (isset($value[1]) ? (int)$value[1] : null);
           $day = (isset($value[2]) ? (int)$value[2] : null);
-        break;
+          break;
 
         case 'year_month':
           $year = (isset($value[0]) ? (int)$value[0] : null);
           $month = (isset($value[1]) ? (int)$value[1] : null);
-        break;
+          break;
 
         case 'month':
           $month = (isset($value[0]) ? (int)$value[0] : null);
-        break;
+          break;
 
         case 'year':
           $year = (isset($value[0]) ? (int)$value[0] : null);
-        break;
+          break;
       }
     }
 
diff --git a/lib/Models/CustomField.php b/lib/Models/CustomField.php
index bb71a34b63..3601a5066e 100644
--- a/lib/Models/CustomField.php
+++ b/lib/Models/CustomField.php
@@ -58,7 +58,7 @@ class CustomField extends Model {
             $value['month'],
             $value['day']
           );
-        break;
+          break;
 
         case 'year_month':
           $value = sprintf(
@@ -66,7 +66,7 @@ class CustomField extends Model {
             $value['year'],
             $value['month']
           );
-        break;
+          break;
 
         case 'month':
           if((int)$value['month'] === 0) {
@@ -77,7 +77,7 @@ class CustomField extends Model {
               $value['month']
             );
           }
-        break;
+          break;
 
         case 'year':
           if((int)$value['year'] === 0) {
@@ -88,7 +88,7 @@ class CustomField extends Model {
               $value['year']
             );
           }
-        break;
+          break;
       }
     }
 
diff --git a/lib/Subscription/Pages.php b/lib/Subscription/Pages.php
index 89898a147a..3496a3a412 100644
--- a/lib/Subscription/Pages.php
+++ b/lib/Subscription/Pages.php
@@ -225,9 +225,9 @@ class Pages {
 
       if($custom_field['type'] === 'date') {
         $date_formats = FormBlockDate::getDateFormats();
-        $custom_field['params']['date_format'] = $date_formats[
-          $custom_field['params']['date_type']
-        ][0];
+        $custom_field['params']['date_format'] = array_shift(
+          $date_formats[$custom_field['params']['date_type']]
+        );
       }
 
       return $custom_field;