diff --git a/src/GroupAddressPicker.js b/src/GroupAddressPicker.js
index dfc90841a3..7da37b6df1 100644
--- a/src/GroupAddressPicker.js
+++ b/src/GroupAddressPicker.js
@@ -61,7 +61,7 @@ export function showGroupAddRoomDialog(groupId) {
         </div>;
 
         const checkboxContainer = <label className="mx_GroupAddressPicker_checkboxContainer">
-            <input type="checkbox" onClick={onCheckboxClicked} />
+            <input type="checkbox" onChange={onCheckboxClicked} />
             <div>
                 { _t("Show these rooms to non-members on the community page and room list?") }
             </div>
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index dd520bb7d4..9311f08abf 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -409,10 +409,6 @@ export default createReactClass({
         groupIsNew: PropTypes.bool,
     },
 
-    childContextTypes: {
-        groupStore: PropTypes.instanceOf(GroupStore),
-    },
-
     getInitialState: function() {
         return {
             summary: null,
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index 145ef32643..f7bba5ba4a 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -319,7 +319,7 @@ export const TermsAuthEntry = createReactClass({
 
             checkboxes.push(
                 <label key={"policy_checkbox_" + policy.id} className="mx_InteractiveAuthEntryComponents_termsPolicy">
-                    <input type="checkbox" onClick={() => this._togglePolicy(policy.id)} checked={checked} />
+                    <input type="checkbox" onChange={() => this._togglePolicy(policy.id)} checked={checked} />
                     <a href={policy.url} target="_blank" rel="noopener">{ policy.name }</a>
                 </label>,
             );
diff --git a/src/components/views/auth/ModularServerConfig.js b/src/components/views/auth/ModularServerConfig.js
index ff8d88f738..684e8d5912 100644
--- a/src/components/views/auth/ModularServerConfig.js
+++ b/src/components/views/auth/ModularServerConfig.js
@@ -104,7 +104,7 @@ export default class ModularServerConfig extends ServerConfig {
                         </a>,
                     },
                 )}
-                <form onSubmit={this.onSubmit} autoComplete={false} action={null}>
+                <form onSubmit={this.onSubmit} autoComplete="off" action={null}>
                     <div className="mx_ServerConfig_fields">
                         <Field id="mx_ServerConfig_hsUrl"
                             label={_t("Server Name")}
diff --git a/src/components/views/auth/ServerConfig.js b/src/components/views/auth/ServerConfig.js
index 81777abb73..e5523b1e36 100644
--- a/src/components/views/auth/ServerConfig.js
+++ b/src/components/views/auth/ServerConfig.js
@@ -279,7 +279,7 @@ export default class ServerConfig extends React.PureComponent {
                 {errorText}
                 {this._renderHomeserverSection()}
                 {this._renderIdentityServerSection()}
-                <form onSubmit={this.onSubmit} autoComplete={false} action={null}>
+                <form onSubmit={this.onSubmit} autoComplete="off" action={null}>
                     {submitButton}
                 </form>
             </div>
diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js
index f6d5b65fd6..65d581c3bc 100644
--- a/src/components/views/dialogs/ShareDialog.js
+++ b/src/components/views/dialogs/ShareDialog.js
@@ -153,7 +153,7 @@ export default class ShareDialog extends React.Component {
                     <input type="checkbox"
                            id="mx_ShareDialog_checkbox"
                            checked={this.state.linkSpecificEvent}
-                           onClick={this.onLinkSpecificEventCheckboxClick} />
+                           onChange={this.onLinkSpecificEventCheckboxClick} />
                     <label htmlFor="mx_ShareDialog_checkbox">
                         { _t('Link to most recent message') }
                     </label>
diff --git a/src/components/views/elements/EditableItemList.js b/src/components/views/elements/EditableItemList.js
index a9513cfe2f..c74fd6a4ee 100644
--- a/src/components/views/elements/EditableItemList.js
+++ b/src/components/views/elements/EditableItemList.js
@@ -120,7 +120,7 @@ export default class EditableItemList extends React.Component {
 
     _renderNewItemField() {
         return (
-            <form onSubmit={this._onItemAdded} autoComplete={false}
+            <form onSubmit={this._onItemAdded} autoComplete="off"
                   noValidate={true} className="mx_EditableItemList_newItem">
                 <Field id={`mx_EditableItemList_new_${this.props.id}`} label={this.props.placeholder} type="text"
                        autoComplete="off" value={this.props.newItem || ""} onChange={this._onNewItemChanged} />
diff --git a/src/components/views/groups/GroupRoomInfo.js b/src/components/views/groups/GroupRoomInfo.js
index 420c163769..f9f7324e23 100644
--- a/src/components/views/groups/GroupRoomInfo.js
+++ b/src/components/views/groups/GroupRoomInfo.js
@@ -181,7 +181,7 @@ module.exports = createReactClass({
                             <input type="radio"
                                 value="public"
                                 checked={this.state.groupRoom.isPublic}
-                                onClick={this._changeGroupRoomPublicity}
+                                onChange={this._changeGroupRoomPublicity}
                             />
                             <div className="mx_MemberInfo_label_text">
                                 { _t('Visible to everyone') }
@@ -193,7 +193,7 @@ module.exports = createReactClass({
                             <input type="radio"
                                 value="private"
                                 checked={!this.state.groupRoom.isPublic}
-                                onClick={this._changeGroupRoomPublicity}
+                                onChange={this._changeGroupRoomPublicity}
                             />
                             <div className="mx_MemberInfo_label_text">
                                 { _t('Only visible to community members') }
diff --git a/src/components/views/room_settings/RoomProfileSettings.js b/src/components/views/room_settings/RoomProfileSettings.js
index 1c36328c00..3a7b0954eb 100644
--- a/src/components/views/room_settings/RoomProfileSettings.js
+++ b/src/components/views/room_settings/RoomProfileSettings.js
@@ -177,7 +177,7 @@ export default class RoomProfileSettings extends React.Component {
         }
 
         return (
-            <form onSubmit={this._saveProfile} autoComplete={false} noValidate={true}>
+            <form onSubmit={this._saveProfile} autoComplete="off" noValidate={true}>
                 <input type="file" ref="avatarUpload" className="mx_ProfileSettings_avatarUpload"
                        onChange={this._onAvatarChanged} accept="image/*" />
                 <div className="mx_ProfileSettings_profile">
diff --git a/src/components/views/settings/DevicesPanelEntry.js b/src/components/views/settings/DevicesPanelEntry.js
index 129b138929..98ba29471d 100644
--- a/src/components/views/settings/DevicesPanelEntry.js
+++ b/src/components/views/settings/DevicesPanelEntry.js
@@ -81,7 +81,7 @@ export default class DevicesPanelEntry extends React.Component {
                     { lastSeen }
                 </div>
                 <div className="mx_DevicesPanel_deviceButtons">
-                    <input type="checkbox" onClick={this.onDeviceToggled} checked={this.props.selected} />
+                    <input type="checkbox" onChange={this.onDeviceToggled} checked={this.props.selected} />
                 </div>
             </div>
         );
diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.js
index d3522e7b23..e9f3b64141 100644
--- a/src/components/views/settings/ProfileSettings.js
+++ b/src/components/views/settings/ProfileSettings.js
@@ -155,7 +155,7 @@ export default class ProfileSettings extends React.Component {
         }
 
         return (
-            <form onSubmit={this._saveProfile} autoComplete={false} noValidate={true}>
+            <form onSubmit={this._saveProfile} autoComplete="off" noValidate={true}>
                 <input type="file" ref="avatarUpload" className="mx_ProfileSettings_avatarUpload"
                        onChange={this._onAvatarChanged} accept="image/*" />
                 <div className="mx_ProfileSettings_profile">
diff --git a/src/components/views/settings/account/EmailAddresses.js b/src/components/views/settings/account/EmailAddresses.js
index a1817b374b..30fc805f6d 100644
--- a/src/components/views/settings/account/EmailAddresses.js
+++ b/src/components/views/settings/account/EmailAddresses.js
@@ -229,7 +229,7 @@ export default class EmailAddresses extends React.Component {
         return (
             <div className="mx_EmailAddresses">
                 {existingEmailElements}
-                <form onSubmit={this._onAddClick} autoComplete={false}
+                <form onSubmit={this._onAddClick} autoComplete="off"
                       noValidate={true} className="mx_EmailAddresses_new">
                     <Field id="mx_EmailAddressses_newEmailAddress"
                         type="text"
diff --git a/src/components/views/settings/account/PhoneNumbers.js b/src/components/views/settings/account/PhoneNumbers.js
index e3b1f5d2a7..55e95a9031 100644
--- a/src/components/views/settings/account/PhoneNumbers.js
+++ b/src/components/views/settings/account/PhoneNumbers.js
@@ -231,7 +231,7 @@ export default class PhoneNumbers extends React.Component {
                         <br />
                         {this.state.verifyError}
                     </div>
-                    <form onSubmit={this._onContinueClick} autoComplete={false} noValidate={true}>
+                    <form onSubmit={this._onContinueClick} autoComplete="off" noValidate={true}>
                         <Field id="mx_PhoneNumbers_newPhoneNumberCode"
                             type="text"
                             label={_t("Verification code")}
@@ -260,8 +260,7 @@ export default class PhoneNumbers extends React.Component {
         return (
             <div className="mx_PhoneNumbers">
                 {existingPhoneElements}
-                <form onSubmit={this._onAddClick} autoComplete={false}
-                      noValidate={true} className="mx_PhoneNumbers_new">
+                <form onSubmit={this._onAddClick} autoComplete="off" noValidate={true} className="mx_PhoneNumbers_new">
                     <div className="mx_PhoneNumbers_input">
                         <Field id="mx_PhoneNumbers_newPhoneNumber"
                             type="text"
diff --git a/src/components/views/settings/discovery/PhoneNumbers.js b/src/components/views/settings/discovery/PhoneNumbers.js
index d6c447938d..4188d1cdc7 100644
--- a/src/components/views/settings/discovery/PhoneNumbers.js
+++ b/src/components/views/settings/discovery/PhoneNumbers.js
@@ -207,11 +207,7 @@ export class PhoneNumber extends React.Component {
                     <br />
                     {this.state.verifyError}
                 </span>
-                <form
-                    onSubmit={this.onContinueClick}
-                    autoComplete={false}
-                    noValidate={true}
-                >
+                <form onSubmit={this.onContinueClick} autoComplete="off" noValidate={true}>
                     <Field id="mx_PhoneNumbers_newPhoneNumberCode"
                         type="text"
                         label={_t("Verification code")}
diff --git a/src/components/views/settings/tabs/room/NotificationSettingsTab.js b/src/components/views/settings/tabs/room/NotificationSettingsTab.js
index 28c6e7dd5e..e399d27f12 100644
--- a/src/components/views/settings/tabs/room/NotificationSettingsTab.js
+++ b/src/components/views/settings/tabs/room/NotificationSettingsTab.js
@@ -156,7 +156,7 @@ export default class NotificationsSettingsTab extends React.Component {
                     </div>
                     <div>
                         <h3>{_t("Set a new custom sound")}</h3>
-                        <form autoComplete={false} noValidate={true}>
+                        <form autoComplete="off" noValidate={true}>
                             <input ref="soundUpload" className="mx_NotificationSound_soundUpload" type="file" onChange={this._onSoundUploadChanged.bind(this)} accept="audio/*" />
                         </form>