diff --git a/imports/ui/components/Field.jsx b/imports/ui/components/Field.jsx
index cef5ea6..8f7faf0 100644
--- a/imports/ui/components/Field.jsx
+++ b/imports/ui/components/Field.jsx
@@ -13,7 +13,7 @@ export class Field extends React.Component {
   triggerUpdate() {
     // Trigger an onChange on inital load, to support browser prefilled values.
     const { onChange } = this.props;
-    if (this.input) {
+    if (this.input && this.input.value) {
       onChange({ target: { value: this.input.value } });
     }
   }
@@ -25,7 +25,7 @@ export class Field extends React.Component {
   componentDidUpdate(prevProps) {
     // Re-mount component so that we don't expose browser prefilled passwords if the component was
     // a password before and now something else.
-    if (prevProps.formState !== this.props.formState) {
+    if (prevProps.id !== this.props.id) {
       this.setState({mount: false});
     }
     else if (!this.state.mount) {