diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 19e18fed48..34b6083c30 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -289,19 +289,21 @@ module.exports = React.createClass({
                         );
                     })}
 
-                    <div className="mx_RoomSettings_aliasesTableRow" key="new">
-                        <EditableText
-                            ref="add_alias"
-                            className="mx_RoomSettings_alias mx_RoomSettings_editable"
-                            placeholderClassName="mx_RoomSettings_aliasPlaceholder"
-                            placeholder={ "New address (e.g. #foo:" + localDomain + ")" }
-                            blurToCancel={ false }
-                            onValueChanged={ self.onAliasAdded } />
-                        <div className="mx_RoomSettings_addAlias">
-                             <img src="img/plus.svg" width="14" height="14" alt="Add"
-                                  onClick={ self.onAliasAdded.bind(self, undefined) }/>
-                        </div>                        
-                    </div>                      
+                    { this.props.canSetAliases ?
+                        <div className="mx_RoomSettings_aliasesTableRow" key="new">
+                            <EditableText
+                                ref="add_alias"
+                                className="mx_RoomSettings_alias mx_RoomSettings_editable"
+                                placeholderClassName="mx_RoomSettings_aliasPlaceholder"
+                                placeholder={ "New address (e.g. #foo:" + localDomain + ")" }
+                                blurToCancel={ false }
+                                onValueChanged={ self.onAliasAdded } />
+                            <div className="mx_RoomSettings_addAlias">
+                                 <img src="img/plus.svg" width="14" height="14" alt="Add"
+                                      onClick={ self.onAliasAdded.bind(self, undefined) }/>
+                            </div>                        
+                        </div> : ""
+                    }
                 </div>
 
                 { remote_aliases_section }
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 74b326e987..80f927c89a 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -471,9 +471,8 @@ module.exports = React.createClass({
 
         var tagsSection = 
             <div className="mx_RoomSettings_tags">
-                Tagged as:
                 { canSetTag ?
-                    tags.map(function(tag, i) {
+                    ("Tagged as: " + tags.map(function(tag, i) {
                         return (<label key={ i }>
                                     <input type="checkbox"
                                            ref={ tag.ref }
@@ -481,7 +480,7 @@ module.exports = React.createClass({
                                            onChange={ self._onTagChange.bind(self, tag.name) }/>
                                     { tag.label }
                                 </label>);
-                    }) : (self.state.tags && self.state.tags.join) ? self.state.tags.join(", ") : "None"
+                    })) : (self.state.tags && self.state.tags.join) ? ("Tagged as: " +self.state.tags.join(", ")) : ""
                 }
             </div>