diff --git a/src/http_keys.ml b/src/http_keys.ml
index 9ed1de5b..48ae48ce 100644
--- a/src/http_keys.ml
+++ b/src/http_keys.ml
@@ -33,7 +33,7 @@ let mk_keys ~db_conn ~sm ~last_issue_date =
   (* todo asset_type
      Type of the asset. "fiat", "crypto", "regional" or "stock". *)
   let asset_type = "xxx" in
-  let* accounts = Pg.get_wire_accouts db_conn |> unwrap_err_caqti in
+  let* accounts = Pg.get_wire_accounts db_conn |> unwrap_err_caqti in
   let* wire_fees =
     (* todo
        where does wire_methods comes from? *)
diff --git a/src/pg.ml b/src/pg.ml
index 59022317..6d711389 100644
--- a/src/pg.ml
+++ b/src/pg.ml
@@ -624,6 +624,15 @@ let disable_wire =
   fun (module Conn : CONN) ~payto_uri ~validity_end ->
     Conn.exec disable_wire (payto_uri, validity_end)
 
+let get_wire_accounts =
+  let get_wire_accounts =
+    Caqti_type.(unit ->* exchange_wire_account)
+      "SELECT payto_uri, conversion_url, debit_restrictions::TEXT, \
+       credit_restrictions::TEXT, master_sig, bank_label, priority FROM \
+       wire_accounts WHERE is_active"
+  in
+  fun (module Conn : CONN) -> Conn.collect_list get_wire_accounts ()
+
 let insert_drain_profit =
   let insert_drain_profit =
     Caqti_type.(drain_profit_message ->. unit)
@@ -649,40 +658,6 @@ let insert_partner =
   in
   fun (module Conn : CONN) v -> Conn.exec insert_partner v
 
-let get_wire_accouts =
-  let get_wire_accounts =
-    let master_sig = Bin_sig.MasterWireDetails.caqti in
-    Caqti_type.(
-      unit
-      ->* t7 string (option string) account_restrictions account_restrictions
-            master_sig (option string) (option int))
-      "SELECT payto_uri, conversion_url, debit_restrictions::TEXT, \
-       credit_restrictions::TEXT, master_sig, bank_label, priority FROM \
-       wire_accounts WHERE is_active"
-  in
-  fun (module Conn : CONN) ->
-    let open Syntax in
-    let+ l = Conn.collect_list get_wire_accounts () in
-    List.map
-      (fun ( payto_uri,
-             conversion_url,
-             debit_restrictions,
-             credit_restrictions,
-             master_sig,
-             bank_label,
-             priority ) ->
-        ExchangeWireAccount.
-          {
-            payto_uri;
-            conversion_url;
-            debit_restrictions;
-            credit_restrictions;
-            master_sig;
-            bank_label;
-            priority;
-          })
-      l
-
 (* TODO
 iterate_denominations
 iterate_active_signkeys