diff --git a/src/cljs/auto_ap/subs.cljs b/src/cljs/auto_ap/subs.cljs
index 623aef23..bb4c59f5 100644
--- a/src/cljs/auto_ap/subs.cljs
+++ b/src/cljs/auto_ap/subs.cljs
@@ -253,7 +253,7 @@
                               first
                               :account
                               :id)
-         default-id (:id (:default-account v))
+         default-id (:id (:default-account vendor))
          i (or client-override default-id)]
      (accounts i))))
 
diff --git a/src/cljs/auto_ap/views/pages/invoices/form.cljs b/src/cljs/auto_ap/views/pages/invoices/form.cljs
index 7f94743f..23c02087 100644
--- a/src/cljs/auto_ap/views/pages/invoices/form.cljs
+++ b/src/cljs/auto_ap/views/pages/invoices/form.cljs
@@ -177,6 +177,7 @@
  (forms/change-handler ::form
                        (fn  [data field value]
                          (let [locations @(re-frame/subscribe [::subs/locations-for-client (:id (:client data))])]
+                           
                            (cond  (and (= [:vendor] field)
                                        value)
                                   (let [schedule-payment-dom (get (by (comp :id :client ) :dom (:schedule-payment-dom value))
@@ -185,7 +186,7 @@
                                       
                                       (expense-accounts-field/can-replace-with-default? (:expense-accounts data))
                                       (into [[:expense-accounts] (expense-accounts-field/default-account (:expense-accounts data)
-                                                                                                         @(re-frame/subscribe [::subs/vendor-default-account value (:client data)])
+                                                                                                         @(re-frame/subscribe [::subs/vendor-default-account (:id value) (:client data)])
                                                                                                          (:total data)
                                                                                                          locations)])
 
@@ -430,13 +431,17 @@
                                           :spec ::invoice/total
                                           :step "0.01"}])
 
-                     (field nil
-                            [expense-accounts-field {:type "expense-accounts"
-                                                     :descriptor "expense account"
-                                                     :locations (:locations (:client data))
-                                                     :max (:total data)
-                                                     :client (or (:client data) @(re-frame/subscribe [::subs/client]))
-                                                     :field [:expense-accounts]}])
+                     (with-meta 
+                       (field nil
+                              [expense-accounts-field {:type "expense-accounts"
+                                                       :descriptor "expense account"
+                                                       :locations (:locations (:client data))
+                                                       :max (:total data)
+                                                       :client (or (:client data) @(re-frame/subscribe [::subs/client]))
+                                                       :field [:expense-accounts]}])
+                       {:key (str (:id (:vendor data)))})
+
+