diff --git a/src/components/views/settings/EmailAddresses.js b/src/components/views/settings/EmailAddresses.js
index 24d1547fd7..d8577f6a99 100644
--- a/src/components/views/settings/EmailAddresses.js
+++ b/src/components/views/settings/EmailAddresses.js
@@ -97,7 +97,7 @@ export class ExistingEmailAddress extends React.Component {
                         {_t("No")}
                     </AccessibleButton>
                 </div>
-            )
+            );
         }
 
         return (
@@ -196,7 +196,7 @@ export default class EmailAddresses extends React.Component {
 
     render() {
         const existingEmailElements = this.state.emails.map((e) => {
-            return <ExistingEmailAddress email={e} onRemoved={this._onRemoved} key={e.address}/>;
+            return <ExistingEmailAddress email={e} onRemoved={this._onRemoved} key={e.address} />;
         });
 
         let addButton = (
@@ -222,7 +222,7 @@ export default class EmailAddresses extends React.Component {
                 <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}/>
+                           type="text" autoComplete="off" disabled={this.state.verifying} />
                     {addButton}
                 </form>
             </div>
diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.js
index 6bffd92f85..649128e4f3 100644
--- a/src/components/views/settings/ProfileSettings.js
+++ b/src/components/views/settings/ProfileSettings.js
@@ -109,18 +109,18 @@ export default class ProfileSettings extends React.Component {
         // TODO: Why is rendering a box with an overlay so complicated? Can the DOM be reduced?
 
         let showOverlayAnyways = true;
-        let avatarElement = <div className="mx_ProfileSettings_avatarPlaceholder"/>;
+        let avatarElement = <div className="mx_ProfileSettings_avatarPlaceholder" />;
         if (this.state.avatarUrl) {
             showOverlayAnyways = false;
             avatarElement = <img src={this.state.avatarUrl}
-                                 alt={_t("Profile picture")} />
+                                 alt={_t("Profile picture")} />;
         }
 
         const avatarOverlayClasses = classNames({
             "mx_ProfileSettings_avatarOverlay": true,
             "mx_ProfileSettings_avatarOverlay_show": showOverlayAnyways,
         });
-        let avatarHoverElement = (
+        const avatarHoverElement = (
             <div className={avatarOverlayClasses} onClick={this._uploadAvatar}>
                 <span className="mx_ProfileSettings_avatarOverlayText">{_t("Upload profile picture")}</span>
                 <div className="mx_ProfileSettings_avatarOverlayImgContainer">
@@ -132,7 +132,7 @@ export default class ProfileSettings extends React.Component {
         return (
             <form onSubmit={this._saveProfile} autoComplete={false} noValidate={true}>
                 <input type="file" ref="avatarUpload" className="mx_ProfileSettings_avatarUpload"
-                       onChange={this._onAvatarChanged} accept="image/*"/>
+                       onChange={this._onAvatarChanged} accept="image/*" />
                 <div className="mx_ProfileSettings_profile">
                     <div className="mx_ProfileSettings_controls">
                         <p>{this.state.userId}</p>