diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 3c56d41f9a..5b7496e8b2 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -44,7 +44,7 @@ var INITIAL_SIZE = 20;
 module.exports = React.createClass({
     displayName: 'RoomView',
     propTypes: {
-        ConferenceHandler: React.PropTypes.any // VectorConferenceHandler
+        ConferenceHandler: React.PropTypes.any
     },
 
     getInitialState: function() {
diff --git a/src/components/structures/login/PostRegistration.js b/src/components/structures/login/PostRegistration.js
index 5af8d37dd8..51625a5971 100644
--- a/src/components/structures/login/PostRegistration.js
+++ b/src/components/structures/login/PostRegistration.js
@@ -58,12 +58,11 @@ module.exports = React.createClass({
     render: function() {
         var ChangeDisplayName = sdk.getComponent('settings.ChangeDisplayName');
         var ChangeAvatar = sdk.getComponent('settings.ChangeAvatar');
+        var LoginHeader = sdk.getComponent('login.LoginHeader');
         return (
             <div className="mx_Login">
                 <div className="mx_Login_box">
-                    <div className="mx_Login_logo">
-                        <img src="img/logo.png" width="249" height="78" alt="vector"/>
-                    </div>
+                    <LoginHeader />
                     <div className="mx_Login_profile">
                         Set a display name:
                         <ChangeDisplayName />
diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index 0cb1a87752..1570641556 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -234,12 +234,11 @@ module.exports = React.createClass({
     },
 
     render: function() {
+        var LoginHeader = sdk.getComponent('login.LoginHeader');
         return (
             <div className="mx_Login">
                 <div className="mx_Login_box">
-                    <div className="mx_Login_logo">
-                        <img src="img/logo.png" width="249" height="78" alt="vector"/>
-                    </div>
+                    <LoginHeader />
                     {this._getRegisterContentJsx()}
                 </div>
             </div>
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 11984da7f3..db5195d3c0 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -29,7 +29,7 @@ module.exports = React.createClass({
     displayName: 'RoomList',
 
     propTypes: {
-        ConferenceHandler: React.PropTypes.any, // e.g. VectorConferenceHandler
+        ConferenceHandler: React.PropTypes.any,
         collapsed: React.PropTypes.bool,
         currentRoom: React.PropTypes.string
     },