diff --git a/internal_packages/composer-signature/lib/preferences-signatures.jsx b/internal_packages/composer-signature/lib/preferences-signatures.jsx
index 0a73a7b3c..fbc64a2ee 100644
--- a/internal_packages/composer-signature/lib/preferences-signatures.jsx
+++ b/internal_packages/composer-signature/lib/preferences-signatures.jsx
@@ -102,7 +102,7 @@ export default class PreferencesSignatures extends React.Component {
         </div>
         <div className="render-mode">
           <input type="checkbox" id="render-mode" checked={this.state.editAsHTML} onClick={this._onToggleEditAsHTML} />
-          <label>Edit raw HTML</label>
+          <label htmlFor="render-mode">Edit raw HTML</label>
         </div>
       </div>
     )
diff --git a/internal_packages/preferences/lib/tabs/update-channel-section.jsx b/internal_packages/preferences/lib/tabs/update-channel-section.jsx
index 9434c821b..5df7a90d5 100644
--- a/internal_packages/preferences/lib/tabs/update-channel-section.jsx
+++ b/internal_packages/preferences/lib/tabs/update-channel-section.jsx
@@ -58,10 +58,17 @@ class UpdateChannelSection extends React.Component {
   render() {
     const {current, available, saving} = this.state;
 
+    // HACK: Temporarily do not allow users to move on to the Salesforce channel.
+    // In the future we could implement this server-side via a "public" flag.
+    let allowed = available;
+    if (current && current.name.toLowerCase() !== 'salesforce') {
+      allowed = available.filter(c => c.name.toLowerCase() !== 'salesforce');
+    }
+
     return (
       <section>
         <h6>Updates</h6>
-        <label forHtml="">Release channel: </label>
+        <label>Release channel: </label>
         <select
           style={{minWidth: 130}}
           value={current.name}
@@ -69,7 +76,7 @@ class UpdateChannelSection extends React.Component {
           disabled={saving}
         >
           {
-            available.map((channel) => {
+            allowed.map((channel) => {
               return (<option value={channel.name} key={channel.name}>
                 {channel.name[0].toUpperCase() + channel.name.substr(1)}
               </option>);