diff --git a/src/components/structures/CreateRoom.js b/src/components/structures/CreateRoom.js
index 36cc11575b..f6e2baeaf2 100644
--- a/src/components/structures/CreateRoom.js
+++ b/src/components/structures/CreateRoom.js
@@ -255,9 +255,7 @@ module.exports = React.createClass({
 
             return (
             <div className="mx_CreateRoom">
-                <SimpleRoomHeader>
-                    Create room
-                </SimpleRoomHeader>
+                <SimpleRoomHeader title="CreateRoom" />
                 <div className="mx_CreateRoom_body">
                     <input type="text" ref="room_name" value={this.state.room_name} onChange={this.onNameChange} placeholder="Name"/> <br />
                     <textarea className="mx_CreateRoom_description" ref="topic" value={this.state.topic} onChange={this.onTopicChange} placeholder="Topic"/> <br />
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 6ac8d06f0d..a5f2a59878 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -331,9 +331,7 @@ module.exports = React.createClass({
 
         return (
             <div className="mx_UserSettings">
-                <SimpleRoomHeader>
-                    Settings
-                </SimpleRoomHeader>
+                <SimpleRoomHeader title="Settings"/>
 
                 <GeminiScrollbar className="mx_UserSettings_body" autoshow={true}>
 
diff --git a/src/components/views/rooms/SimpleRoomHeader.js b/src/components/views/rooms/SimpleRoomHeader.js
index bd4ed23ebe..8388da4a71 100644
--- a/src/components/views/rooms/SimpleRoomHeader.js
+++ b/src/components/views/rooms/SimpleRoomHeader.js
@@ -25,19 +25,18 @@ var React = require('react');
 module.exports = React.createClass({
     displayName: 'SimpleRoomHeader',
 
-    render: function() {
-        var cancel;
-        var header = (
-            <div className="mx_RoomHeader_wrapper">
-                <div className="mx_RoomHeader_simpleHeader">
-                    { this.props.children }
-                </div>
-            </div>
-        );
+    propTypes: {
+        title: React.PropTypes.string,
+    },
 
+    render: function() {
         return (
             <div className="mx_RoomHeader" >
-                { header }
+                <div className="mx_RoomHeader_wrapper">
+                    <div className="mx_RoomHeader_simpleHeader">
+                        { this.props.title }
+                    </div>
+                </div>
             </div>
         );
     },