diff --git a/res/css/_components.scss b/res/css/_components.scss
index 6f66a8c15e..4fb0eed4af 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -95,6 +95,7 @@
 @import "./views/elements/_SyntaxHighlight.scss";
 @import "./views/elements/_ToggleSwitch.scss";
 @import "./views/elements/_ToolTipButton.scss";
+@import "./views/elements/_Tooltip.scss";
 @import "./views/globals/_MatrixToolbar.scss";
 @import "./views/groups/_GroupPublicityToggle.scss";
 @import "./views/groups/_GroupRoomList.scss";
@@ -137,7 +138,6 @@
 @import "./views/rooms/_RoomPreviewBar.scss";
 @import "./views/rooms/_RoomRecoveryReminder.scss";
 @import "./views/rooms/_RoomTile.scss";
-@import "./views/rooms/_RoomTooltip.scss";
 @import "./views/rooms/_RoomUpgradeWarningBar.scss";
 @import "./views/rooms/_SearchBar.scss";
 @import "./views/rooms/_SearchableEntityList.scss";
diff --git a/res/css/views/elements/_Field.scss b/res/css/views/elements/_Field.scss
index 4a74262fd4..20b1efd28b 100644
--- a/res/css/views/elements/_Field.scss
+++ b/res/css/views/elements/_Field.scss
@@ -141,6 +141,39 @@ limitations under the License.
     color: $greyed-fg-color;
 }
 
+.mx_Field_valid {
+    &.mx_Field,
+    &.mx_Field:focus-within {
+        border-color: $input-valid-border-color;
+    }
+
+    &.mx_Field label,
+    &.mx_Field:focus-within label {
+        color: $input-valid-border-color;
+    }
+}
+
+.mx_Field_invalid {
+    &.mx_Field,
+    &.mx_Field:focus-within {
+        border-color: $input-invalid-border-color;
+    }
+
+    &.mx_Field label,
+    &.mx_Field:focus-within label {
+        color: $input-invalid-border-color;
+    }
+}
+
+.mx_Field_tooltip {
+    margin-top: -12px;
+    margin-left: 4px;
+}
+
+.mx_Field_tooltip.mx_Field_valid {
+    animation: mx_fadeout 1s 2s forwards;
+}
+
 // Customise other components when placed inside a Field
 
 .mx_Field .mx_Dropdown_input {
diff --git a/res/css/views/rooms/_RoomTooltip.scss b/res/css/views/elements/_Tooltip.scss
similarity index 54%
rename from res/css/views/rooms/_RoomTooltip.scss
rename to res/css/views/elements/_Tooltip.scss
index 295786d2d3..78604b1564 100644
--- a/res/css/views/rooms/_RoomTooltip.scss
+++ b/res/css/views/elements/_Tooltip.scss
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,41 +15,55 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_RoomTooltip_chevron {
-    position: absolute;
-    left: -8px;
-    top: 4px;
-    width: 0;
-    height: 0;
-    border-top: 8px solid transparent;
-    border-right: 8px solid $menu-bg-color;
-    border-bottom: 8px solid transparent;
+@keyframes mx_fadein {
+    from { opacity: 0; }
+    to { opacity: 1; }
 }
 
-.mx_RoomTooltip_chevron:after {
-    content:'';
+@keyframes mx_fadeout {
+    from { opacity: 1; }
+    to { opacity: 0; }
+}
+
+.mx_Tooltip_chevron {
+    position: absolute;
+    left: -7px;
+    top: 10px;
     width: 0;
     height: 0;
     border-top: 7px solid transparent;
-    border-right: 7px solid $primary-bg-color;
+    border-right: 7px solid $menu-border-color;
     border-bottom: 7px solid transparent;
-    position:absolute;
-    top: -7px;
+}
+
+.mx_Tooltip_chevron:after {
+    content:'';
+    width: 0;
+    height: 0;
+    border-top: 6px solid transparent;
+    border-right: 6px solid $menu-bg-color;
+    border-bottom: 6px solid transparent;
+    position: absolute;
+    top: -6px;
     left: 1px;
 }
 
-.mx_RoomTooltip {
+.mx_Tooltip {
     display: none;
+    animation: mx_fadein 0.2s;
     position: fixed;
-    border-radius: 5px;
-    box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.21);
-    background-color: $primary-bg-color;
+    border: 1px solid $menu-border-color;
+    border-radius: 4px;
+    box-shadow: 4px 4px 12px 0 rgba(118, 131, 156, 0.6);
+    background-color: $menu-bg-color;
     z-index: 2000;
-    padding: 5px;
+    padding: 10px;
     pointer-events: none;
     line-height: 14px;
-    font-size: 13px;
+    font-size: 12px;
+    font-weight: 600;
     color: $primary-fg-color;
-    max-width: 600px;
+    max-width: 200px;
+    word-break: break-word;
     margin-right: 50px;
 }
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index deed7235cb..3112644a73 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -53,6 +53,7 @@ $input-lighter-bg-color: #f2f5f8;
 $input-lighter-fg-color: $input-darker-fg-color;
 $input-focused-border-color: #238cf5;
 $input-valid-border-color: $accent-color;
+$input-invalid-border-color: $warning-color;
 
 $field-focused-label-bg-color: $bg-color;
 
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 4d8e4fa40e..879be67dda 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -79,6 +79,7 @@ $input-lighter-bg-color: #f2f5f8;
 $input-lighter-fg-color: $input-darker-fg-color;
 $input-focused-border-color: #238cf5;
 $input-valid-border-color: $accent-color;
+$input-invalid-border-color: $warning-color;
 
 $field-focused-label-bg-color: #ffffff;
 
@@ -95,7 +96,7 @@ $input-fg-color: rgba(74, 74, 74, 0.9);
 $scrollbar-thumb-color: rgba(0, 0, 0, 0.2);
 $scrollbar-track-color: transparent;
 // context menus
-$menu-border-color: #ebedf8;
+$menu-border-color: #e7e7e7;
 $menu-bg-color: #fff;
 $menu-box-shadow-color: rgba(118, 131, 156, 0.6);
 $menu-selected-color: #f5f8fa;
diff --git a/src/components/structures/BottomLeftMenu.js b/src/components/structures/BottomLeftMenu.js
index 47b30be450..2f48bd0299 100644
--- a/src/components/structures/BottomLeftMenu.js
+++ b/src/components/structures/BottomLeftMenu.js
@@ -145,8 +145,8 @@ module.exports = React.createClass({
     // Get the label/tooltip to show
     getLabel: function(label, show) {
         if (show) {
-            const RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
-            return <RoomTooltip className="mx_BottomLeftMenu_tooltip" label={label} />;
+            const Tooltip = sdk.getComponent("elements.Tooltip");
+            return <Tooltip className="mx_BottomLeftMenu_tooltip" label={label} />;
         }
     },
 
diff --git a/src/components/views/auth/PasswordLogin.js b/src/components/views/auth/PasswordLogin.js
index 4b095d405f..ed3afede2f 100644
--- a/src/components/views/auth/PasswordLogin.js
+++ b/src/components/views/auth/PasswordLogin.js
@@ -70,11 +70,6 @@ class PasswordLogin extends React.Component {
         this.isLoginEmpty = this.isLoginEmpty.bind(this);
     }
 
-    componentWillMount() {
-        this._passwordField = null;
-        this._loginField = null;
-    }
-
     onForgotPasswordClick(ev) {
         ev.preventDefault();
         ev.stopPropagation();
@@ -180,7 +175,6 @@ class PasswordLogin extends React.Component {
                 return <Field
                     className={classNames(classes)}
                     id="mx_PasswordLogin_email"
-                    ref={(e) => { this._loginField = e; }}
                     name="username" // make it a little easier for browser's remember-password
                     key="email_input"
                     type="text"
@@ -196,7 +190,6 @@ class PasswordLogin extends React.Component {
                 return <Field
                     className={classNames(classes)}
                     id="mx_PasswordLogin_username"
-                    ref={(e) => { this._loginField = e; }}
                     name="username" // make it a little easier for browser's remember-password
                     key="username_input"
                     type="text"
@@ -223,7 +216,6 @@ class PasswordLogin extends React.Component {
                 return <Field
                     className={classNames(classes)}
                     id="mx_PasswordLogin_phoneNumber"
-                    ref={(e) => { this._loginField = e; }}
                     name="phoneNumber"
                     key="phone_input"
                     type="text"
@@ -344,7 +336,6 @@ class PasswordLogin extends React.Component {
                     <Field
                         className={pwFieldClass}
                         id="mx_PasswordLogin_password"
-                        ref={(e) => { this._passwordField = e; }}
                         type="password"
                         name="password"
                         label={_t('Password')}
diff --git a/src/components/views/elements/ActionButton.js b/src/components/views/elements/ActionButton.js
index 1ca5ab9983..1eb082a917 100644
--- a/src/components/views/elements/ActionButton.js
+++ b/src/components/views/elements/ActionButton.js
@@ -69,8 +69,8 @@ export default React.createClass({
 
         let tooltip;
         if (this.state.showTooltip) {
-            const RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
-            tooltip = <RoomTooltip className="mx_RoleButton_tooltip" label={this.props.label} />;
+            const Tooltip = sdk.getComponent("elements.Tooltip");
+            tooltip = <Tooltip className="mx_RoleButton_tooltip" label={this.props.label} />;
         }
 
         const icon = this.props.iconPath ?
diff --git a/src/components/views/elements/Field.js b/src/components/views/elements/Field.js
index c6a2113adb..daf6ec0ce1 100644
--- a/src/components/views/elements/Field.js
+++ b/src/components/views/elements/Field.js
@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
+import sdk from '../../../index';
 
 export default class Field extends React.PureComponent {
     static propTypes = {
@@ -31,25 +32,43 @@ export default class Field extends React.PureComponent {
         label: PropTypes.string,
         // The field's placeholder string. Defaults to the label.
         placeholder: PropTypes.string,
+        // The field's value.
+        // This is a controlled component, so the value is required.
+        value: PropTypes.string.isRequired,
         // Optional component to include inside the field before the input.
         prefix: PropTypes.node,
+        // The callback called whenever the contents of the field
+        // changes.  Returns an object with `valid` boolean field
+        // and a `feedback` react component field to provide feedback
+        // to the user.
+        onValidate: PropTypes.func,
         // All other props pass through to the <input>.
     };
 
-    get value() {
-        if (!this.refs.fieldInput) return null;
-        return this.refs.fieldInput.value;
+    constructor() {
+        super();
+        this.state = {
+            valid: undefined,
+            feedback: undefined,
+        };
     }
 
-    set value(newValue) {
-        if (!this.refs.fieldInput) {
-            throw new Error("No field input reference");
+    onChange = (ev) => {
+        if (this.props.onValidate) {
+            const result = this.props.onValidate(ev.target.value);
+            this.setState({
+                valid: result.valid,
+                feedback: result.feedback,
+            });
         }
-        this.refs.fieldInput.value = newValue;
-    }
+        // Parent component may have supplied its own `onChange` as well
+        if (this.props.onChange) {
+            this.props.onChange(ev);
+        }
+    };
 
     render() {
-        const { element, prefix, children, ...inputProps } = this.props;
+        const { element, prefix, onValidate, children, ...inputProps } = this.props;
 
         const inputElement = element || "input";
 
@@ -58,6 +77,8 @@ export default class Field extends React.PureComponent {
         inputProps.ref = "fieldInput";
         inputProps.placeholder = inputProps.placeholder || inputProps.label;
 
+        inputProps.onChange = this.onChange;
+
         const fieldInput = React.createElement(inputElement, inputProps, children);
 
         let prefixContainer = null;
@@ -65,17 +86,37 @@ export default class Field extends React.PureComponent {
             prefixContainer = <span className="mx_Field_prefix">{prefix}</span>;
         }
 
-        const classes = classNames("mx_Field", `mx_Field_${inputElement}`, {
+        let validClass;
+        if (onValidate) {
+            validClass = classNames({
+                mx_Field_valid: this.state.valid === true,
+                mx_Field_invalid: this.state.valid === false,
+            });
+        }
+
+        const fieldClasses = classNames("mx_Field", `mx_Field_${inputElement}`, {
             // If we have a prefix element, leave the label always at the top left and
             // don't animate it, as it looks a bit clunky and would add complexity to do
             // properly.
             mx_Field_labelAlwaysTopLeft: prefix,
+            [validClass]: true,
         });
 
-        return <div className={classes}>
+        // handle displaying feedback on validity
+        const Tooltip = sdk.getComponent("elements.Tooltip");
+        let feedback;
+        if (this.state.feedback) {
+            feedback = <Tooltip
+                tooltipClassName="mx_Field_tooltip"
+                label={this.state.feedback}
+            />;
+        }
+
+        return <div className={fieldClasses}>
             {prefixContainer}
             {fieldInput}
             <label htmlFor={this.props.id}>{this.props.label}</label>
+            {feedback}
         </div>;
     }
 }
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index f5ee60a2d8..ef9864358b 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -156,7 +156,7 @@ export default React.createClass({
     render: function() {
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const RoomTooltip = sdk.getComponent('rooms.RoomTooltip');
+        const Tooltip = sdk.getComponent('elements.Tooltip');
         const profile = this.state.profile || {};
         const name = profile.name || this.props.tag;
         const avatarHeight = 40;
@@ -181,7 +181,7 @@ export default React.createClass({
         }
 
         const tip = this.state.hover ?
-            <RoomTooltip className="mx_TagTile_tooltip" label={name} /> :
+            <Tooltip className="mx_TagTile_tooltip" label={name} /> :
             <div />;
         const contextButton = this.state.hover || this.state.menuDisplayed ?
             <div className="mx_TagTile_context_button" onClick={this.onContextButtonClick}>
diff --git a/src/components/views/elements/ToolTipButton.js b/src/components/views/elements/ToolTipButton.js
index b5b2d735ee..239095f196 100644
--- a/src/components/views/elements/ToolTipButton.js
+++ b/src/components/views/elements/ToolTipButton.js
@@ -39,8 +39,8 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        const RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
-        const tip = this.state.hover ? <RoomTooltip
+        const Tooltip = sdk.getComponent("elements.Tooltip");
+        const tip = this.state.hover ? <Tooltip
             className="mx_ToolTipButton_container"
             tooltipClassName="mx_ToolTipButton_helpText"
             label={this.props.helpText}
diff --git a/src/components/views/rooms/RoomTooltip.js b/src/components/views/elements/Tooltip.js
similarity index 89%
rename from src/components/views/rooms/RoomTooltip.js
rename to src/components/views/elements/Tooltip.js
index bce0922637..473aeb3bdc 100644
--- a/src/components/views/rooms/RoomTooltip.js
+++ b/src/components/views/elements/Tooltip.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,22 +24,21 @@ import classNames from 'classnames';
 const MIN_TOOLTIP_HEIGHT = 25;
 
 module.exports = React.createClass({
-    displayName: 'RoomTooltip',
+    displayName: 'Tooltip',
 
     propTypes: {
         // Class applied to the element used to position the tooltip
-        className: React.PropTypes.string.isRequired,
+        className: React.PropTypes.string,
         // Class applied to the tooltip itself
         tooltipClassName: React.PropTypes.string,
-        // The tooltip is derived from either the room name or a label
-        room: React.PropTypes.object,
+        // the react element to put into the tooltip
         label: React.PropTypes.node,
     },
 
     // Create a wrapper for the tooltip outside the parent and attach it to the body element
     componentDidMount: function() {
         this.tooltipContainer = document.createElement("div");
-        this.tooltipContainer.className = "mx_RoomTileTooltip_wrapper";
+        this.tooltipContainer.className = "mx_Tooltip_wrapper";
         document.body.appendChild(this.tooltipContainer);
         window.addEventListener('scroll', this._renderTooltip, true);
 
@@ -85,11 +85,11 @@ module.exports = React.createClass({
         style = this._updatePosition(style);
         style.display = "block";
 
-        const tooltipClasses = classNames("mx_RoomTooltip", this.props.tooltipClassName);
+        const tooltipClasses = classNames("mx_Tooltip", this.props.tooltipClassName);
 
         const tooltip = (
             <div className={tooltipClasses} style={style}>
-                <div className="mx_RoomTooltip_chevron" />
+                <div className="mx_Tooltip_chevron" />
                 { this.props.label }
             </div>
         );
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index 44441f4754..8482bce593 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -143,8 +143,8 @@ export default React.createClass({
 
         let tooltip;
         if (this.props.collapsed && this.state.hover) {
-            const RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
-            tooltip = <RoomTooltip className="mx_RoomTile_tooltip" label={groupName} dir="auto" />;
+            const Tooltip = sdk.getComponent("elements.Tooltip");
+            tooltip = <Tooltip className="mx_RoomTile_tooltip" label={groupName} dir="auto" />;
         }
 
         const classes = classNames('mx_RoomTile mx_RoomTile_highlight', {
diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index 55263ef7b7..6a4128dfa7 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -44,9 +44,9 @@ export default class MStickerBody extends MImageBody {
 
         if (!content || !content.body || !content.info || !content.info.w) return null;
 
-        const RoomTooltip = sdk.getComponent('rooms.RoomTooltip');
+        const Tooltip = sdk.getComponent('elements.Tooltip');
         return <div style={{left: content.info.w + 'px'}} className="mx_MStickerBody_tooltip">
-            <RoomTooltip label={content.body} />
+            <Tooltip label={content.body} />
         </div>;
     }
 
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index f9e9d64b9e..4bf160007e 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -364,8 +364,8 @@ module.exports = React.createClass({
                 label = <EmojiText element="div" title={name} className={nameClasses} dir="auto">{ name }</EmojiText>;
             }
         } else if (this.state.hover) {
-            const RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
-            tooltip = <RoomTooltip className="mx_RoomTile_tooltip" label={this.props.room.name} dir="auto" />;
+            const Tooltip = sdk.getComponent("elements.Tooltip");
+            tooltip = <Tooltip className="mx_RoomTile_tooltip" label={this.props.room.name} dir="auto" />;
         }
 
         //var incomingCallBox;
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index 69b80b03b3..ba708beaf4 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -32,6 +32,7 @@ import sessionStore from '../../../stores/SessionStore';
 
 module.exports = React.createClass({
     displayName: 'ChangePassword',
+
     propTypes: {
         onFinished: PropTypes.func,
         onError: PropTypes.func,
@@ -73,6 +74,9 @@ module.exports = React.createClass({
         return {
             phase: this.Phases.Edit,
             cachedPassword: null,
+            oldPassword: "",
+            newPassword: "",
+            newPasswordConfirm: "",
         };
     },
 
@@ -165,6 +169,9 @@ module.exports = React.createClass({
         }).finally(() => {
             this.setState({
                 phase: this.Phases.Edit,
+                oldPassword: "",
+                newPassword: "",
+                newPasswordConfirm: "",
             });
         }).done();
     },
@@ -192,11 +199,29 @@ module.exports = React.createClass({
         );
     },
 
+    onChangeOldPassword(ev) {
+        this.setState({
+            oldPassword: ev.target.value,
+        });
+    },
+
+    onChangeNewPassword(ev) {
+        this.setState({
+            newPassword: ev.target.value,
+        });
+    },
+
+    onChangeNewPasswordConfirm(ev) {
+        this.setState({
+            newPasswordConfirm: ev.target.value,
+        });
+    },
+
     onClickChange: function(ev) {
         ev.preventDefault();
-        const oldPassword = this.state.cachedPassword || this.refs.old_input.value;
-        const newPassword = this.refs.new_input.value;
-        const confirmPassword = this.refs.confirm_input.value;
+        const oldPassword = this.state.cachedPassword || this.state.oldPassword;
+        const newPassword = this.state.newPassword;
+        const confirmPassword = this.state.newPasswordConfirm;
         const err = this.props.onCheckPassword(
             oldPassword, newPassword, confirmPassword,
         );
@@ -217,7 +242,12 @@ module.exports = React.createClass({
         if (!this.state.cachedPassword) {
             currentPassword = (
                 <div className={rowClassName}>
-                    <Field id="passwordold" type="password" ref="old_input" label={_t('Current password')} />
+                    <Field id="mx_ChangePassword_oldPassword"
+                        type="password"
+                        label={_t('Current password')}
+                        value={this.state.oldPassword}
+                        onChange={this.onChangeOldPassword}
+                    />
                 </div>
             );
         }
@@ -230,11 +260,21 @@ module.exports = React.createClass({
                     <form className={this.props.className} onSubmit={this.onClickChange}>
                         { currentPassword }
                         <div className={rowClassName}>
-                            <Field id="password1" type="password" ref="new_input" label={passwordLabel}
-                                   autoFocus={this.props.autoFocusNewPasswordInput} />
+                            <Field id="mx_ChangePassword_newPassword"
+                                type="password"
+                                label={passwordLabel}
+                                value={this.state.newPassword}
+                                autoFocus={this.props.autoFocusNewPasswordInput}
+                                onChange={this.onChangeNewPassword}
+                            />
                         </div>
                         <div className={rowClassName}>
-                            <Field id="password2" type="password" ref="confirm_input" label={_t("Confirm password")} />
+                            <Field id="mx_ChangePassword_newPasswordConfirm"
+                                type="password"
+                                label={_t("Confirm password")}
+                                value={this.state.newPasswordConfirm}
+                                onChange={this.onChangeNewPasswordConfirm}
+                            />
                         </div>
                         <AccessibleButton className={buttonClassName} kind={this.props.buttonKind} onClick={this.onClickChange}>
                             { _t('Change Password') }
diff --git a/src/components/views/settings/EmailAddresses.js b/src/components/views/settings/EmailAddresses.js
index 1ded71a5c7..b221f91901 100644
--- a/src/components/views/settings/EmailAddresses.js
+++ b/src/components/views/settings/EmailAddresses.js
@@ -119,6 +119,7 @@ export default class EmailAddresses extends React.Component {
             verifying: false,
             addTask: null,
             continueDisabled: false,
+            newEmailAddress: "",
         };
     }
 
@@ -134,14 +135,20 @@ export default class EmailAddresses extends React.Component {
         this.setState({emails: this.state.emails.filter((e) => e !== address)});
     };
 
+    _onChangeNewEmailAddress = (e) => {
+        this.setState({
+            newEmailAddress: e.target.value,
+        });
+    };
+
     _onAddClick = (e) => {
         e.stopPropagation();
         e.preventDefault();
 
-        if (!this.refs.newEmailAddress) return;
+        if (!this.state.newEmailAddress) return;
 
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-        const email = this.refs.newEmailAddress.value;
+        const email = this.state.newEmailAddress;
 
         // TODO: Inline field validation
         if (!Email.looksValid(email)) {
@@ -173,14 +180,14 @@ export default class EmailAddresses extends React.Component {
 
         this.setState({continueDisabled: true});
         this.state.addTask.checkEmailLinkClicked().then(() => {
-            const email = this.refs.newEmailAddress.value;
+            const email = this.state.newEmailAddress;
             this.setState({
                 emails: [...this.state.emails, {address: email, medium: "email"}],
                 addTask: null,
                 continueDisabled: false,
                 verifying: false,
+                newEmailAddress: "",
             });
-            this.refs.newEmailAddress.value = "";
         }).catch((err) => {
             this.setState({continueDisabled: false});
             if (err.errcode !== 'M_THREEPID_AUTH_FAILED') {
@@ -221,8 +228,14 @@ export default class EmailAddresses extends React.Component {
                 {existingEmailElements}
                 <form onSubmit={this._onAddClick} autoComplete={false}
                       noValidate={true} className="mx_EmailAddresses_new">
-                    <Field id="newEmailAddress" ref="newEmailAddress" label={_t("Email Address")}
-                           type="text" autoComplete="off" disabled={this.state.verifying} />
+                    <Field id="mx_EmailAddressses_newEmailAddress"
+                        type="text"
+                        label={_t("Email Address")}
+                        autoComplete="off"
+                        disabled={this.state.verifying}
+                        value={this.state.newEmailAddress}
+                        onChange={this._onChangeNewEmailAddress}
+                    />
                     {addButton}
                 </form>
             </div>
diff --git a/src/components/views/settings/PhoneNumbers.js b/src/components/views/settings/PhoneNumbers.js
index d85642d346..5d1d9b849f 100644
--- a/src/components/views/settings/PhoneNumbers.js
+++ b/src/components/views/settings/PhoneNumbers.js
@@ -117,6 +117,8 @@ export default class PhoneNumbers extends React.Component {
             addTask: null,
             continueDisabled: false,
             phoneCountry: "",
+            newPhoneNumber: "",
+            newPhoneNumberCode: "",
         };
     }
 
@@ -132,14 +134,26 @@ export default class PhoneNumbers extends React.Component {
         this.setState({msisdns: this.state.msisdns.filter((e) => e !== address)});
     };
 
+    _onChangeNewPhoneNumber = (e) => {
+        this.setState({
+            newPhoneNumber: e.target.value,
+        });
+    };
+
+    _onChangeNewPhoneNumberCode = (e) => {
+        this.setState({
+            newPhoneNumberCode: e.target.value,
+        });
+    };
+
     _onAddClick = (e) => {
         e.stopPropagation();
         e.preventDefault();
 
-        if (!this.refs.newPhoneNumber) return;
+        if (!this.state.newPhoneNumber) return;
 
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-        const phoneNumber = this.refs.newPhoneNumber.value;
+        const phoneNumber = this.state.newPhoneNumber;
         const phoneCountry = this.state.phoneCountry;
 
         const task = new AddThreepid();
@@ -162,7 +176,7 @@ export default class PhoneNumbers extends React.Component {
         e.preventDefault();
 
         this.setState({continueDisabled: true});
-        const token = this.refs.newPhoneNumberCode.value;
+        const token = this.state.newPhoneNumberCode;
         this.state.addTask.haveMsisdnToken(token).then(() => {
             this.setState({
                 msisdns: [...this.state.msisdns, {address: this.state.verifyMsisdn, medium: "msisdn"}],
@@ -171,8 +185,9 @@ export default class PhoneNumbers extends React.Component {
                 verifying: false,
                 verifyMsisdn: "",
                 verifyError: null,
+                newPhoneNumber: "",
+                newPhoneNumberCode: "",
             });
-            this.refs.newPhoneNumber.value = "";
         }).catch((err) => {
             this.setState({continueDisabled: false});
             if (err.errcode !== 'M_THREEPID_AUTH_FAILED') {
@@ -205,22 +220,28 @@ export default class PhoneNumbers extends React.Component {
         if (this.state.verifying) {
             const msisdn = this.state.verifyMsisdn;
             addVerifySection = (
-              <div>
-                  <div>
-                      {_t("A text message has been sent to +%(msisdn)s. " +
-                          "Please enter the verification code it contains", {msisdn: msisdn})}
-                      <br />
-                      {this.state.verifyError}
-                  </div>
-                  <form onSubmit={this._onContinueClick} autoComplete={false} noValidate={true}>
-                      <Field id="newPhoneNumberCode" ref="newPhoneNumberCode" label={_t("Verification code")}
-                             type="text" autoComplete="off" disabled={this.state.continueDisabled} />
-                      <AccessibleButton onClick={this._onContinueClick} kind="primary"
-                                        disabled={this.state.continueDisabled}>
-                          {_t("Continue")}
-                      </AccessibleButton>
-                  </form>
-              </div>
+                <div>
+                    <div>
+                        {_t("A text message has been sent to +%(msisdn)s. " +
+                            "Please enter the verification code it contains", { msisdn: msisdn })}
+                        <br />
+                        {this.state.verifyError}
+                    </div>
+                    <form onSubmit={this._onContinueClick} autoComplete={false} noValidate={true}>
+                        <Field id="mx_PhoneNumbers_newPhoneNumberCode"
+                            type="text"
+                            label={_t("Verification code")}
+                            autoComplete="off"
+                            disabled={this.state.continueDisabled}
+                            value={this.state.newPhoneNumberCode}
+                            onChange={this._onChangeNewPhoneNumberCode}
+                        />
+                        <AccessibleButton onClick={this._onContinueClick} kind="primary"
+                                          disabled={this.state.continueDisabled}>
+                            {_t("Continue")}
+                        </AccessibleButton>
+                    </form>
+                </div>
             );
         }
 
@@ -238,9 +259,15 @@ export default class PhoneNumbers extends React.Component {
                 <form onSubmit={this._onAddClick} autoComplete={false}
                       noValidate={true} className="mx_PhoneNumbers_new">
                     <div className="mx_PhoneNumbers_input">
-                        <Field id="newPhoneNumber" ref="newPhoneNumber" label={_t("Phone Number")}
-                               type="text" autoComplete="off" disabled={this.state.verifying}
-                               prefix={phoneCountry} />
+                        <Field id="mx_PhoneNumbers_newPhoneNumber"
+                            type="text"
+                            label={_t("Phone Number")}
+                            autoComplete="off"
+                            disabled={this.state.verifying}
+                            prefix={phoneCountry}
+                            value={this.state.newPhoneNumber}
+                            onChange={this._onChangeNewPhoneNumber}
+                        />
                     </div>
                     {addVerifySection}
                 </form>