diff --git a/src/clj/auto_ap/ssr/transaction/edit.clj b/src/clj/auto_ap/ssr/transaction/edit.clj
index 09bd7283..b4400f4b 100644
--- a/src/clj/auto_ap/ssr/transaction/edit.clj
+++ b/src/clj/auto_ap/ssr/transaction/edit.clj
@@ -229,7 +229,13 @@
                        (com/a-icon-button {"@click.prevent.stop" "show=false; setTimeout(() => $refs.p.remove(), 500)"} svg/x))))
 
 (defn- account-field-name [index field]
-  (str "step-params[transaction/accounts][" index "][" (name field) "]"))
+  (str "step-params[transaction/accounts][" index "]["
+       (if (keyword? field)
+         (str (when (namespace field)
+                (str (namespace field) "/"))
+              (name field))
+         field)
+       "]"))
 
 (defn transaction-account-row-no-cursor* [{:keys [account index client-id amount-mode total]}]
   (com/data-grid-row
@@ -403,7 +409,7 @@
 (defn toggle-amount-mode [request]
   (let [snapshot (-> request :multi-form-state :snapshot)
         old-mode (or (:amount-mode snapshot) "$")
-        new-mode (or (get-in request [:form-params :amount-mode]) "$")
+        new-mode (or (get-in request [:multi-form-state :step-params :amount-mode]) "$")
         total (Math/abs (or (:transaction/amount snapshot) 0.0))
         accounts (convert-accounts-mode (:transaction/accounts snapshot) old-mode new-mode total)
         updated-request (-> request