diff --git a/app/__init__.py b/app/__init__.py
index 8b2e2ce..fd530ca 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -187,6 +187,8 @@ def create_vehicle():
 
     if form.consumables.data:
         form.consumables.default = form.consumables.data
+    else:
+        form.consumables.default = []
 
     if form.validate_on_submit():
         if len(form.consumables.data) == 0:
diff --git a/app/forms.py b/app/forms.py
index f884643..5a51f8c 100644
--- a/app/forms.py
+++ b/app/forms.py
@@ -82,7 +82,7 @@ class CreatePitstopForm(Form):
         if self.date.data:
             self.date.default = self.date.data
         else:
-            self.date.default = self.last_pitstop.date
+            self.date.default = date.today()
         if self.odometer.data:
             self.odometer.default = self.odometer.data
         else: