diff --git a/electrum/gui/qml/components/controls/BtcField.qml b/electrum/gui/qml/components/controls/BtcField.qml
index 53b0e61c5..04f296782 100644
--- a/electrum/gui/qml/components/controls/BtcField.qml
+++ b/electrum/gui/qml/components/controls/BtcField.qml
@@ -31,4 +31,6 @@ TextField {
                 : ''
         }
     }
+
+    Component.onCompleted: textAsSats = Config.unitsToSats('')
 }
diff --git a/electrum/plugins/payserver/www b/electrum/plugins/payserver/www
index bcb6d9ecf..bde9d3b5f 160000
--- a/electrum/plugins/payserver/www
+++ b/electrum/plugins/payserver/www
@@ -1 +1 @@
-Subproject commit bcb6d9ecf75b6785451402068651cfa785b709fa
+Subproject commit bde9d3b5fbf34623ca04c14eb6b0db6676c5ec52