diff --git a/cmd/demo.yaml b/cmd/demo.yaml
index dce3e2f50..590057f73 100644
--- a/cmd/demo.yaml
+++ b/cmd/demo.yaml
@@ -60,23 +60,21 @@ meters:
         if (state.batterySoC < 10) state.batterySoC = 90;
         if (state.batterySoC > 90) state.batterySoC = 10;
         state.batterySoC;
+
   - name: meter_charger_1
     type: custom
     power:
       source: js
       vm: shared
       script: state.loadpoints[0].chargepower;
+
   - name: meter_charger_2
     type: custom
     power:
       source: js
       vm: shared
       script: state.loadpoints[1].chargepower;
-  - name: meter_charger_3
-    type: custom
-    power:
-      source: js
-      script: 0
+
 chargers:
   - name: charger_1
     type: custom
@@ -106,6 +104,7 @@ chargers:
         var lp = state.loadpoints[0];
         lp.maxcurrent = val;
         if (lp.enabled) lp.chargepower = lp.maxcurrent * 230 * lp.phases; else lp.chargepower = 0;
+
   - name: charger_2
     type: custom
     enable:
@@ -134,24 +133,6 @@ chargers:
         var lp = state.loadpoints[1];
         lp.maxcurrent = val;
         if (lp.enabled) lp.chargepower = lp.maxcurrent * 230 * lp.phases; else lp.chargepower = 0;
-  - name: charger_3
-    type: custom
-    enable:
-      source: js
-      vm: shared
-      script:
-    enabled:
-      source: js
-      vm: shared
-      script: false
-    status:
-      source: js
-      vm: shared
-      script: "'A'"
-    maxcurrent:
-      source: js
-      vm: shared
-      script: 16
 
 vehicles:
   - name: vehicle_1
@@ -174,6 +155,7 @@ vehicles:
         var range = (44 * lp.vehicleSoC) / 15;
         range
     capacity: 44
+
   - name: vehicle_2
     title: weißes Model 3
     type: custom
@@ -215,20 +197,10 @@ loadpoints:
     soc:
       target: 90
     meter: meter_charger_1
-    vehicle: vehicle_1
-    vehicles:
-      - vehicle_2
+    vehicle: vehicle_1 # default
   - title: Garage
     charger: charger_2
     soc:
       target: 75
     mode: "off"
     meter: meter_charger_2
-    vehicles:
-      - vehicle_1
-      - vehicle_2
-#  - title: Garage rechts
-#    charger: charger_3
-#    mode: "off"
-#    meters:
-#      charge: meter_charger_3
diff --git a/evcc.dist.yaml b/evcc.dist.yaml
index a2c46c678..c6d634574 100644
--- a/evcc.dist.yaml
+++ b/evcc.dist.yaml
@@ -63,6 +63,7 @@ vehicles:
     password: mypassword # password
     vin: WREN...
     onIdentify: # set defaults when vehicle is identified
+      mode: pv # enable PV-charging when vehicle is identified
       minSoC: 20 # charge to at least 20% independent of charge mode
       targetSoC: 90 # limit charge to 90%
 
@@ -82,11 +83,8 @@ loadpoints:
   - title: Garage # display name for UI
     charger: wallbe # charger
     meter: charge # charge meter
-    vehicle: audi
-    # vehicles: # use if multiple vehicles allowed to charge on this loadpoint
-    # - ID.3
-    # - e-Up
-    mode: pv
+    mode: "off" # set default charge mode, use "off" to disable by default if charger is publicly available
+    # vehicle: car1 # set default vehicle (disables vehicle detection)
     resetOnDisconnect: true # set defaults when vehicle disconnects
     soc:
       # polling defines usage of the vehicle APIs
diff --git a/schema.json b/schema.json
index cc66c8292..935fbd66a 100644
--- a/schema.json
+++ b/schema.json
@@ -126,10 +126,14 @@
             }
           }
         },
-        "prioritySoC": {
+        "vehicles": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
         },
-        "bufferSoC": {
-        }
+        "prioritySoC": {},
+        "bufferSoC": {}
       }
     },
     "loadpoints": {
@@ -153,19 +157,8 @@
           "charger": {
             "type": "string"
           },
-          "meters": {
-            "type": "object",
-            "properties": {
-              "charge": {
-                "type": "string"
-              }
-            }
-          },
-          "vehicles": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
+          "meter": {
+            "type": "string"
           },
           "soc": {
             "type": "object",