diff --git a/project.clj b/project.clj
index 41e320f0..ec1aba3f 100644
--- a/project.clj
+++ b/project.clj
@@ -147,7 +147,7 @@
                              [com.bhauman/rebel-readline-cljs "0.1.4" :exclusions [org.clojure/clojurescript]]
                              [javax.servlet/servlet-api "2.5"]]
               :plugins      [[lein-pdo "0.1.1"]]
-              :jvm-opts ["-Dconfig=config/dev.edn" "-Dlogback.configurationFile=logback.xml" "-Xms4G" "-Xmx20G" ]}
+              :jvm-opts ["-Dconfig=config/dev.edn" "-Dlogback.configurationFile=logback.xml" "-Xms4G" "-Xmx20G" "-XX:-OmitStackTraceInFastThrow" ]}
 
              :uberjar
              {:java-cmd "/usr/lib/jvm/java-11-openjdk/bin/java"
diff --git a/src/clj/auto_ap/handler.clj b/src/clj/auto_ap/handler.clj
index 64b3cd10..a213b27e 100644
--- a/src/clj/auto_ap/handler.clj
+++ b/src/clj/auto_ap/handler.clj
@@ -84,7 +84,7 @@
       (merge auth/match->handler)
       (merge invoices/match->handler)
       (merge exports/match->handler)
-      (merge
+   (merge
         (into {}
               (map
 
diff --git a/src/clj/auto_ap/ssr/admin/accounts.clj b/src/clj/auto_ap/ssr/admin/accounts.clj
index f87fa63f..895921b0 100644
--- a/src/clj/auto_ap/ssr/admin/accounts.clj
+++ b/src/clj/auto_ap/ssr/admin/accounts.clj
@@ -16,24 +16,26 @@
    [auto-ap.ssr-routes :as ssr-routes]
    [auto-ap.ssr.components :as com]
    [auto-ap.ssr.grid-page-helper :as helper]
+   [auto-ap.ssr.nested-form-params :refer [wrap-nested-form-params]]
    [auto-ap.ssr.svg :as svg]
    [auto-ap.ssr.utils
-    :refer [entity-id
+    :refer [apply-middleware-to-all-handlers
+            entity-id
             forced-vector
             html-response
             map->db-id-decoder
             ref->enum-schema
             ref->select-options
             temp-id
+            validation-error
+            wrap-form-4xx
             wrap-schema-decode]]
    [bidi.bidi :as bidi]
    [clojure.string :as str]
    [datomic.api :as dc]
    [hiccup2.core :as hiccup]
-   [malli.core :as mc]
-   [ring.middleware.nested-params :refer [wrap-nested-params]]))
+   [malli.core :as mc]))
 
-;; TODO support for new account
 (defn filters [request]
   [:form {"hx-trigger"         "change delay:500ms, keyup changed from:.hot-filter delay:1000ms"
           "hx-get"             (bidi/path-for ssr-routes/only-routes
@@ -80,7 +82,6 @@
                 (:sort query-params) (add-sorter-fields {"name" ['[?e :account/name ?n]
                                                                  '[(clojure.string/upper-case ?n) ?sort-name]]
                                                          "code" ['[(get-else $ ?e :account/numeric-code 0) ?sort-code]]
-                                                         
                                                          "type" ['[?e :account/type ?t]
                                                                  '[?t :db/ident ?ti]
                                                                  '[(name ?ti) ?sort-type]]}
@@ -104,7 +105,6 @@
                 (merge-query {:query {:find ['?sort-default '?e]
                                       :where ['[?e :account/code ?un]
                                               '[(clojure.string/upper-case ?un) ?sort-default]]}}))]
-    
     (cond->> (query2 query)
       true (apply-sort-3 query-params)
       true (apply-pagination query-params))))
@@ -132,10 +132,17 @@
                  :parse-query-params (comp
                                        (query-params/parse-key :code query-params/parse-long)
                                        (helper/default-parse-query-params grid-page))
+                 :action-buttons (fn [request]
+                                   [(com/button {:hx-get    (str (bidi/path-for ssr-routes/only-routes
+                                                                                :admin-account-new-dialog))
+                                                 :hx-target "#modal-holder"
+                                                 :hx-swap   "outerHTML"
+                                                 :color     :primary}
+                                                "New Account")])
                  :row-buttons (fn [request entity]
                                 [(com/icon-button {:hx-get (str (bidi/path-for ssr-routes/only-routes
                                                                                 :admin-account-edit-dialog
-                                                                                :db/id (doto (:db/id entity) println)))
+                                                                                :db/id (:db/id entity)))
                                                    :hx-target "#modal-holder"
                                                    :hx-swap   "outerHTML"}
                                                   svg/pencil)])
@@ -153,7 +160,6 @@
                                 :name     "Code"
                                 :sort-key "code"
                                 :render   :account/numeric-code}
-
                                {:key      "name"
                                 :name     "Name"
                                 :sort-key "name"
@@ -170,11 +176,18 @@
 (def row* (partial helper/row* grid-page))
 (def table* (partial helper/table* grid-page))
 
-(defn account-edit-save [{:keys [params route-params] :as request}]
-  (let [_ (audit-transact [[:upsert-entity (-> params (assoc :db/id (:db/id route-params)) (dissoc :id))]]
-                          (:identity request))
-        updated-account (some-> route-params :db/id (#(dc/pull (dc/db conn) default-read %)))]
-
+(defn account-save [{:keys [form-params request-method] :as request}]
+  (let [entity            (cond-> form-params
+                            (= :post request-method) (assoc :db/id "new"))
+        _                 (cond (= :post request-method)
+                                (when-let [extant (seq (dc/q '[:find ?x :in $ ?nc :where [?x :account/numeric-code ?nc]] (dc/db conn) (:account/numeric-code entity)))]
+                                  (validation-error (format "The code %d is already in use." (:account/numeric-code entity)))))
+        {:keys [tempids]} (audit-transact [[:upsert-entity (cond-> entity
+                                                             (:account/numeric-code entity) (assoc :account/code (str (:account/numeric-code entity))))]]
+                                          (:identity request))
+        updated-account   (dc/pull (dc/db conn)
+                                   default-read
+                                   (or (get tempids (:db/id entity)) (:db/id entity)))]
     (solr/index-documents-raw solr/impl
                               "accounts"
                               (into [{"id"            (:db/id updated-account)
@@ -182,7 +195,7 @@
                                       "name"          (:account/name updated-account)
                                       "numeric_code"  (:account/numeric-code updated-account)
                                       "location"      (:account/location updated-account)
-                                      "applicability" (clojure.core/name (:account/applicability updated-account))}]
+                                      "applicability" (some-> updated-account :account/applicability clojure.core/name)}]
                                     (for [o (:account/client-overrides updated-account)]
                                       {"id"                         (:db/id o)
                                        "account_id"                 (:db/id updated-account)
@@ -191,14 +204,13 @@
                                        "location"                   (:account/location updated-account)
                                        "applicability"              (clojure.core/name (:account/applicability updated-account))
                                        "client_id"                  (:db/id (:account-client-override/client o))
-                                       "account_client_override_id" (:db/id o)}))
-                              )
-
-    (html-response 
+                                       "account_client_override_id" (:db/id o)})))
+    (html-response
       (row* identity updated-account {:flash? true})
-      :headers {"hx-trigger" "closeModal"
+      :headers {"hx-trigger"  "closeModal"
                 "hx-retarget" (format "#account-table tr[data-id=\"%d\"]" (:db/id updated-account))})))
 
+
 (defn client-override* [override]
   [:div.flex.gap-2.mb-2.client-override
    [:div.w-96
@@ -215,24 +227,28 @@
                      :value (:account-client-override/name override)})]
    [:div (com/a-icon-button {"_" (hiccup/raw "on click halt the event then transition the closest <.client-override />'s opacity to 0 then remove closest <.client-override />") } svg/x)]])
 
-(defn account-edit-dialog [request]
-  (prn (:route-params request))
-  (let [account (some-> request :route-params :db/id (#(dc/pull (dc/db conn) default-read %)))]
-    (html-response 
-      (com/modal
+
+(defn dialog* [& {:keys [ account form-params]}]
+  (com/modal
         {:modal-class "max-w-4xl"}
-        [:form#edit-form {:hx-ext "response-targets"
-                :hx-post   (str (bidi/path-for ssr-routes/only-routes
-                                               :admin-account-edit-save
-                                               :request-method :post
-                                               :db/id (:db/id account )))
-                :hx-swap   "outerHTML swap:300ms"
-                :hx-target-400 "#form-errors .error-content"}
+        [:form#edit-form (merge {:hx-ext        "response-targets"
+                                 :hx-swap       "outerHTML swap:300ms"
+                                 :hx-target-400 "#form-errors .error-content"}
+                                form-params)
          [:fieldset {:class "hx-disable"}
           (com/modal-card
             {}
             [:div.flex [:div.p-2 "Account"] [:p.ml-2.rounded.bg-gray-200.p-2.dark:bg-gray-600 (:account/numeric-code account) " - " (:account/name account)]]
             [:div.space-y-6
+             (when-let [id (:db/id account)]
+               (com/hidden {:name "db/id"
+                            :value id}))
+             
+             (when (nil? account)
+               (com/field {:label "Numeric code"}
+                          (com/text-input {:name      "account/numeric-code"
+                                           :autofocus true
+                                           :class     "w-32"})))
              (com/field {:label "Name"}
                         (com/text-input {:name  "account/name"
                                          :autofocus true
@@ -251,18 +267,18 @@
 
              (com/field {:label "Invoice Allowance"}
                         (com/select {:name      "account/invoice-allowance"
-                                     :value     (name (:account/invoice-allowance account))
+                                     :value     (some-> account :account/invoice-allowance name)
                                      :class "w-36"
                                      :options   (ref->select-options "allowance")}))
              (com/field {:label "Vendor Allowance"}
                         (com/select {:name    "account/vendor-allowance"
                                      :class "w-36"
-                                     :value   (name (:account/vendor-allowance account))
+                                     :value   (some-> account :account/vendor-allowance name)
                                      :options (ref->select-options "allowance")}))
              (com/field {:label "Applicability"}
                         (com/select {:name    "account/applicability"
                                      :class   "w-36"
-                                     :value   (name (:account/applicability account))
+                                     :value   (some-> account :account/applicability name)
                                      :options (ref->select-options "account-applicability")}))
 
              (com/field {:label "Client Overrides" :id "client-overrides"}
@@ -276,37 +292,56 @@
              [:div#form-errors [:span.error-content]]
              (com/button {:color :primary :form "edit-form" :type "submit"}
                          "Save")]
-            [:div])]]))))
+            [:div])]]))
 
-(defn new-client-override [request]
+(defn new-client-override [_]
   (html-response 
     (client-override* {:db/id (str (java.util.UUID/randomUUID))})))
 
+(defn account-edit-dialog [request]
+  (let [account (some-> request :route-params :db/id (#(dc/pull (dc/db conn) default-read %)))]
+    (html-response (dialog* :account account
+                            :form-params {:hx-put (str (bidi/path-for ssr-routes/only-routes
+                                                                      :admin-account-edit-save))}))))
+
+
+(defn account-new-dialog [_]
+  (html-response (dialog* :account nil
+                          :form-params {:hx-post (str (bidi/path-for ssr-routes/only-routes
+                                                            :admin-account-new-save))})))
+
+(def account-schema (mc/schema
+                      [:map 
+                       [:db/id {:optional true} [:maybe entity-id]]
+                       [:account/numeric-code {:optional true} [:maybe :int]]
+                       [:account/name [:string {:min 1}]]
+                       [:account/location [:maybe :string]]
+                       [:account/type (ref->enum-schema "account-type")]
+                       [:account/applicability (ref->enum-schema "account-applicability")]
+                       [:account/invoice-allowance (ref->enum-schema "allowance")]
+                       [:account/vendor-allowance (ref->enum-schema "allowance")]
+                       [:account/client-overrides {:decode/json map->db-id-decoder
+                                                   :optional true}
+                        [:maybe 
+                         (forced-vector [:map 
+                                         [:db/id [:or entity-id temp-id]]
+                                         [:account-client-override/client [:or entity-id :string]]
+                                         [:account-client-override/name :string]])]]]))
+
 (def key->handler
-  {:admin-accounts            (wrap-admin (helper/page-route grid-page))
-   :admin-account-table       (wrap-admin (helper/table-route grid-page))
-   :admin-account-client-override-new (-> new-client-override wrap-admin wrap-client-redirect-unauthenticated)
-   :admin-account-edit-save   (-> account-edit-save
-                                  wrap-admin
-                                  wrap-client-redirect-unauthenticated
-                                  (wrap-schema-decode
-                                    :route-schema (mc/schema [:map [:db/id entity-id]])
-                                    :params-schema (mc/schema
-                                                     [:map 
-                                                      [:account/name :string]
-                                                      [:account/location [:maybe :string]]
-                                                      [:account/type (ref->enum-schema "account-type")]
-                                                      [:account/applicability (ref->enum-schema "account-applicability")]
-                                                      [:account/invoice-allowance (ref->enum-schema "allowance")]
-                                                      [:account/vendor-allowance (ref->enum-schema "allowance")]
-                                                      [:account/client-overrides {:decode/json map->db-id-decoder}
-                                                       (forced-vector [:map 
-                                                                       [:db/id [:or entity-id temp-id]]
-                                                                       [:account-client-override/client [:or entity-id :string]]
-                                                                       [:account-client-override/name :string]])]]))
-                                  (wrap-nested-params))
-   :admin-account-edit-dialog (-> account-edit-dialog
-                                  wrap-admin
-                                  wrap-client-redirect-unauthenticated
-                                  (wrap-schema-decode
-                                    :route-schema (mc/schema [:map [:db/id entity-id]])))})
+  (apply-middleware-to-all-handlers 
+    (->> 
+      {:admin-accounts                    (helper/page-route grid-page)
+       :admin-account-table               (helper/table-route grid-page)
+       :admin-account-client-override-new (-> new-client-override wrap-admin wrap-client-redirect-unauthenticated)
+       :admin-account-save                (-> account-save
+                                              (wrap-schema-decode :form-schema account-schema)
+                                              (wrap-nested-form-params)
+                                              (wrap-form-4xx))
+       :admin-account-edit-dialog         (-> account-edit-dialog
+                                              (wrap-schema-decode :route-schema [:map [:db/id entity-id]]))
+       :admin-account-new-dialog          account-new-dialog})
+    (fn [h]
+      (-> h
+          (wrap-admin)
+          (wrap-client-redirect-unauthenticated)))))
diff --git a/src/clj/auto_ap/ssr/components.clj b/src/clj/auto_ap/ssr/components.clj
index 9845cc1a..cfa33748 100644
--- a/src/clj/auto_ap/ssr/components.clj
+++ b/src/clj/auto_ap/ssr/components.clj
@@ -27,6 +27,7 @@
 (def text-input inputs/text-input-)
 (def money-input inputs/money-input-)
 (def date-input inputs/date-input-)
+(def hidden inputs/hidden-)
 (def select inputs/select-)
 (def typeahead inputs/typeahead-)
 (def field inputs/field-)
diff --git a/src/clj/auto_ap/ssr/components/inputs.clj b/src/clj/auto_ap/ssr/components/inputs.clj
index 2777dae8..e812faee 100644
--- a/src/clj/auto_ap/ssr/components/inputs.clj
+++ b/src/clj/auto_ap/ssr/components/inputs.clj
@@ -98,3 +98,7 @@ c.clearChoices();
     [:div {:id (:id params)}
      [:label {:class "block mb-2 text-sm font-medium text-gray-900 dark:text-white"} (:label params)]]
     rest))
+
+(defn hidden- [{:keys [name value]}]
+  [:input {:type "hidden" :value value :name name}]
+  )
diff --git a/src/clj/auto_ap/ssr/grid_page_helper.clj b/src/clj/auto_ap/ssr/grid_page_helper.clj
index 36b1782c..733973f7 100644
--- a/src/clj/auto_ap/ssr/grid_page_helper.clj
+++ b/src/clj/auto_ap/ssr/grid_page_helper.clj
@@ -157,6 +157,10 @@
                    (keyword? value)
                    (name value)
 
+                   (and (map? value)
+                        (:db/id value))
+                   (:db/id value)
+
                    :else
                    value)))
     query-params
diff --git a/src/clj/auto_ap/ssr/nested_form_params.clj b/src/clj/auto_ap/ssr/nested_form_params.clj
new file mode 100644
index 00000000..ff902d0c
--- /dev/null
+++ b/src/clj/auto_ap/ssr/nested_form_params.clj
@@ -0,0 +1,92 @@
+(ns auto-ap.ssr.nested-form-params
+  (:require [ring.util.codec :refer [assoc-conj]]))
+
+;; ADAPTED FROM ring.middleware.nested-params
+
+(defn parse-nested-keys
+  "Parse a parameter name into a list of keys using a 'C'-like index
+  notation.
+
+  For example:
+
+    \"foo[bar][][baz]\"
+    => [\"foo\" \"bar\" \"\" \"baz\"]"
+  [param-name]
+  (let [[_ k ks] (re-matches #"(?s)(.*?)((?:\[.*?\])*)" (name param-name))
+        keys     (if ks (map second (re-seq #"\[(.*?)\]" ks)))]
+    (cons k keys)))
+
+(defn- assoc-vec [m k v]
+  (let [m (if (contains? m k) m (assoc m k []))]
+    (assoc-conj m k v)))
+
+(defn- assoc-nested
+  "Similar to assoc-in, but treats values of blank keys as elements in a
+  list."
+  [m [k & ks] v]
+  (if k
+    (if ks
+      (let [[j & js] ks]
+        (if (= j "")
+          (assoc-vec m k (assoc-nested {} js v))
+          (assoc m k (assoc-nested (get m k {}) ks v))))
+      (if (map? m)
+        (assoc-conj m k v)
+        {k v}))
+    v))
+
+(defn- param-pairs
+  "Return a list of name-value pairs for a parameter map."
+  [params]
+  (mapcat
+    (fn [[name value]]
+      (if (and (sequential? value) (not (coll? (first value))))
+        (for [v value] [name v])
+        [[name value]]))
+    params))
+
+(defn- nest-params
+  "Takes a flat map of parameters and turns it into a nested map of
+  parameters, using the function parse to split the parameter names
+  into keys."
+  [params parse]
+  (reduce
+    (fn [m [k v]]
+      (assoc-nested m (parse k) v))
+    {}
+    (param-pairs params)))
+
+(defn nested-params-request
+  "Converts a request with a flat map of parameters to a nested map.
+  See: wrap-nested-params."
+  {:added "1.2"}
+  ([request]
+   (nested-params-request request {}))
+  ([request options]
+   (let [parse (:key-parser options parse-nested-keys)]
+     (update-in request [:form-params] nest-params parse))))
+
+(defn wrap-nested-form-params
+  "Middleware to converts a flat map of parameters into a nested map.
+  Accepts the following options:
+
+  :key-parser - the function to use to parse the parameter names into a list
+                of keys. Keys that are empty strings are treated as elements in
+                a vector, non-empty keys are treated as elements in a map.
+                Defaults to the parse-nested-keys function.
+
+  For example:
+
+    {\"foo[bar]\" \"baz\"}
+    => {\"foo\" {\"bar\" \"baz\"}}
+
+    {\"foo[]\" \"bar\"}
+    => {\"foo\" [\"bar\"]}"
+  ([handler]
+   (wrap-nested-params handler {}))
+  ([handler options]
+   (fn
+     ([request]
+      (handler (nested-params-request request options)))
+     ([request respond raise]
+      (handler (nested-params-request request options) respond raise)))))
diff --git a/src/clj/auto_ap/ssr/users.clj b/src/clj/auto_ap/ssr/users.clj
index d85f5fef..0c379d65 100644
--- a/src/clj/auto_ap/ssr/users.clj
+++ b/src/clj/auto_ap/ssr/users.clj
@@ -17,7 +17,8 @@
    [auto-ap.ssr.grid-page-helper :as helper]
    [auto-ap.ssr.svg :as svg]
    [auto-ap.ssr.utils
-    :refer [entity-id
+    :refer [apply-middleware-to-all-handlers
+            entity-id
             forced-vector
             html-response
             ref->enum-schema
@@ -68,7 +69,15 @@
                                    {:value   "user"
                                     :content "User"}
                                    {:value   "none"
-                                    :content "None"}]}))]])
+                                    :content "None"}]}))
+    (com/field {:label "Client"}
+               (com/typeahead {:name        "client"
+                               :placeholder "Search..."
+                               :url         (bidi/path-for ssr-routes/only-routes
+                                                           :company-search)
+                               :id          (str "client-search")
+                               :value       [(:db/id (:client (:parsed-query-params request)))
+                                             (:client/name (:client (:parsed-query-params request)))]}))]])
 
 (def default-read '[:db/id
                     :user/name
@@ -110,6 +119,12 @@
                                                '[(clojure.string/includes? ?upper-se ?es)]]}
                               :args [(str/upper-case (:email query-params))]})
 
+                (some->> query-params :client :db/id)
+                (merge-query {:query {:find  []
+                                      :in    ['?c]
+                                      :where ['[?e :user/clients ?c]]}
+                              :args  [(some->> query-params :client :db/id)]})
+
                 (some->> query-params :role)
                 (merge-query {:query {:find  []
                                       :in    ['?r]
@@ -171,6 +186,10 @@
        (com/pill {:color :white}
                  (format "%d more" remainder))))])
 
+(defn parse-client [client]
+  (let [client-id (Long/parseLong client)]
+    (dc/pull (dc/db conn) '[:client/name :db/id] client-id)))
+
 (def grid-page
   (helper/build {:id                 "user-table"
                  :nav                (com/admin-aside-nav)
@@ -178,8 +197,7 @@
                  :fetch-page         fetch-page
                  :parse-query-params (comp
                                        (query-params/parse-key :role #(query-params/parse-keyword "user-role" %))
-                                       (query-params/parse-key :total-gte query-params/parse-double)
-                                       (query-params/parse-key :total-lte query-params/parse-double)
+                                       (query-params/parse-key :client parse-client)
                                        (helper/default-parse-query-params grid-page))
                  :row-buttons (fn [request entity]
                                 [(com/button {:hx-post (str (bidi/path-for ssr-routes/only-routes
@@ -241,9 +259,9 @@
      :session {:identity (dissoc (auth/user->jwt user  "FAKE_TOKEN")
                                  :exp)}}))
 
-(defn user-edit-save [{:keys [params route-params] :as request}]
-  (let [_ @(dc/transact conn [[:upsert-entity (-> params (assoc :db/id (:db/id route-params)) (dissoc :id))]])
-        user (some-> request :route-params :db/id (#(dc/pull (dc/db conn) default-read %)))]
+(defn user-edit-save [{:keys [form-params identity] :as request}]
+  (let [_ @(dc/transact conn [[:upsert-entity form-params]])
+        user (some-> form-params  :db/id (#(dc/pull (dc/db conn) default-read %)))]
     
     (html-response 
       (row* identity user {:flash? true})
@@ -259,10 +277,9 @@
       (com/modal
         {}
         [:form {:hx-ext "response-targets"
-                :hx-post   (str (bidi/path-for ssr-routes/only-routes
-                                               :user-edit-save
-                                               :request-method :post
-                                               :db/id (:db/id user )))
+                :hx-put   (str (bidi/path-for ssr-routes/only-routes
+                                              :user-edit-save
+                                              :request-method :put))
                 :hx-swap   "outerHTML swap:300ms"
                 :hx-target-400 "#form-errors .error-content"}
          [:fieldset {:class "hx-disable"}
@@ -270,6 +287,8 @@
             {}
             [:div.flex [:div.p-2 "User"] [:p.ml-2.rounded.bg-gray-200.p-2.dark:bg-gray-600 (:user/name user)]]
             [:div.space-y-6
+             (com/hidden {:name  "db/id"
+                          :value (:db/id user)})
              (com/field {:label "Role"}
                         (com/select {:name        "user/role"
                                      :class "w-36"
@@ -280,8 +299,7 @@
                                                ["power-user" "Power user"]
                                                ["manager" "Manager"]
                                                ["admin" "Admin"]
-                                               ["user" "User"]]
-                                     :size        :small}))
+                                               ["user" "User"]]}))
              (com/field {:label "Clients"}
                         (com/typeahead {:name    "user/clients"
                                         :class   "w-full"
@@ -300,25 +318,24 @@
             [:div])]]))))
 
 (def key->handler
-  {:users            (wrap-admin (helper/page-route grid-page))
-   :user-table       (wrap-admin (helper/table-route grid-page))
-   :user-edit-save   (-> user-edit-save
-                         wrap-admin
-                         wrap-client-redirect-unauthenticated
-                         (wrap-schema-decode
-                           :route-schema (mc/schema [:map [:db/id entity-id]])
-                           :params-schema (mc/schema
-                                     [:map
-                                      [:user/clients (forced-vector entity-id)]
-                                      [:user/role (ref->enum-schema "user-role")]])))
-   :user-edit-dialog (-> user-edit-dialog
-                         wrap-admin
-                         wrap-client-redirect-unauthenticated
-                         (wrap-schema-decode
-                           :route-schema (mc/schema [:map [:db/id entity-id]]))) 
-   :user-impersonate (-> impersonate
-                         wrap-admin
-                         wrap-client-redirect-unauthenticated
-                         (wrap-schema-decode
-                           :params-schema (mc/schema [:map [:db/id entity-id]])))})
+  (apply-middleware-to-all-handlers
+    {:users            (helper/page-route grid-page)
+     :user-table       (helper/table-route grid-page)
+     :user-edit-save   (-> user-edit-save
+                           (wrap-schema-decode
+                             :form-schema (mc/schema
+                                              [:map
+                                               [:db/id entity-id]
+                                               [:user/clients (forced-vector entity-id)]
+                                               [:user/role (ref->enum-schema "user-role")]])))
+     :user-edit-dialog (-> user-edit-dialog
+                           (wrap-schema-decode
+                             :route-schema (mc/schema [:map [:db/id entity-id]]))) 
+     :user-impersonate (-> impersonate
+                           (wrap-schema-decode
+                             :params-schema (mc/schema [:map [:db/id entity-id]])))}
+    (fn [h]
+      (-> h
+          (wrap-admin)
+          (wrap-client-redirect-unauthenticated)))))
 
diff --git a/src/clj/auto_ap/ssr/utils.clj b/src/clj/auto_ap/ssr/utils.clj
index 975ce879..e587f5ac 100644
--- a/src/clj/auto_ap/ssr/utils.clj
+++ b/src/clj/auto_ap/ssr/utils.clj
@@ -8,7 +8,7 @@
    [malli.core :as mc]
    [malli.error :as me]
    [malli.transform :as mt2]
-   [ring.middleware.nested-params :refer [parse-nested-keys]]))
+   [slingshot.slingshot :refer [throw+ try+]]))
 
 (defn html-response [hiccup & {:keys [status headers oob] :or {status 200 headers {} oob []}}]
   {:status  status
@@ -97,11 +97,13 @@
 (defn keyword->str [k]
   (subs (str k) 1))
 
+(defn validation-error [m & [data]]
+  (throw+ (ex-info m (merge data {:type :validation}))))
+
 (defn wrap-schema-decode [handler & {:keys [form-schema query-schema route-schema params-schema]}]
   (fn [{:keys [form-params query-params params]  :as request}]
-    (try
-      
-      (handler (cond-> request
+    (let [request (try
+      (cond-> request
                  (and (:params request) params-schema)
                  (assoc :params
                         (mc/coerce
@@ -123,7 +125,7 @@
                             mt2/json-transformer) ))
 
                  (and form-schema form-params)
-                 (assoc :parsed-form-params
+                 (assoc :form-params
                         (mc/coerce
                           form-schema
                           form-params
@@ -140,23 +142,24 @@
                           (mt2/transformer 
                             (mt2/key-transformer {:encode name :decode keyword})
                             mt2/string-transformer
-                            mt2/json-transformer) ))))
+                            mt2/json-transformer) )))
       (catch Exception e
         (alog/warn ::validation-error :error e)
-        (html-response [:span.error-content.text-red-500 (str/join ", "
-                                                                   (mapcat identity 
-                                                                           (-> e
-                                                                               (ex-data )
-                                                                               :data
-                                                                               :explain
-                                                                               me/humanize
-                                                                               vals)))]
-                       :status 400)))))
-
+        (validation-error (str/join ", "
+                                    (->> e
+                                         (ex-data )
+                                         :data
+                                         :explain
+                                         me/humanize
+                                         (map (fn [[k v]]
+                                                (str (if (keyword? k)
+                                                       (name k)
+                                                       k) ": " (str/join ", " v))
+                                                )))))))] (handler request))))
 (defn ref->enum-schema [n]
   (into [:enum {:decode/string #(keyword n %)}]
         (for [{:db/keys [ident]} (all-schema)
-              :when (= n (namespace ident))]
+              :when              (= n (namespace ident))]
           ident)))
 
 (defn ref->select-options [n & {:keys [allow-nil?]}]
@@ -178,7 +181,7 @@
                                           :else
                                           k)))))})
 
-(defn namespaceize-decoder [n]
+#_(defn namespaceize-decoder [n]
   {:exit (fn [m]
            (when m
              (reduce
@@ -189,3 +192,23 @@
                m
                m)))})
 
+
+(defn wrap-form-4xx [handler]
+  (fn [request]
+    (try+
+      (handler request)
+
+
+      (catch [:type :validation] e
+        (alog/warn ::form-4xx :error e)
+        (html-response [:span.error-content.text-red-500 (:message &throw-context)]
+                       :status 400))))
+  )
+
+(defn apply-middleware-to-all-handlers [key->handler f]
+  (->> key->handler
+       (reduce
+         (fn [key-handler [k v]]
+           (assoc key-handler k (f v)))
+         key->handler)
+       ))
diff --git a/src/cljc/auto_ap/ssr_routes.cljc b/src/cljc/auto_ap/ssr_routes.cljc
index 60b89f47..faef1cd7 100644
--- a/src/cljc/auto_ap/ssr_routes.cljc
+++ b/src/cljc/auto_ap/ssr_routes.cljc
@@ -13,16 +13,18 @@
                                         #"/search/?"                            :admin-history-search
                                         ["/" [#"\d+" :entity-id] #"/?"]         :admin-history
                                         ["/inspect/" [#"\d+" :entity-id] #"/?"] :admin-history-inspect}
-                      "/user" {"" :users
+                      "/user" {"" {:get :users
+                                   :put :user-edit-save}
                                "/table" :user-table
                                "/impersonate" :user-impersonate
-                               [[#"\d+" :db/id] "/edit"] {:get :user-edit-dialog
-                                                            :post :user-edit-save}}
-                      "/account" {""                          :admin-accounts
+                               [[#"\d+" :db/id] "/edit"] {:get  :user-edit-dialog}}
+                      "/account" {""                          {:get :admin-accounts
+                                                               :put :admin-account-save
+                                                               :post :admin-account-save}
                                   "/table"                    :admin-account-table
-                                  "/override/new" :admin-account-client-override-new
-                                  ["/" [#"\d+" :db/id] "/edit"] {:get  :admin-account-edit-dialog
-                                                               :post :admin-account-edit-save}}
+                                  "/new"                    {:get :admin-account-new-dialog}
+                                  [[#"\d+" :db/id] "/edit"] :admin-account-edit-dialog
+                                  "/override/new" :admin-account-client-override-new}
                       "/ezcater-xls" :admin-ezcater-xls}
              "transaction" {"/insights" {"" :transaction-insights
                                          "/table" :transaction-insight-table