diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 519a6a1298..77915b3664 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -648,8 +648,8 @@ module.exports = React.createClass({
                     clientSecret={this.state.register_client_secret}
                     sessionId={this.state.register_session_id}
                     idSid={this.state.register_id_sid}
-                    hsUrl={config.default_hs_url}
-                    isUrl={config.default_is_url}
+                    hsUrl={this.props.config.default_hs_url}
+                    isUrl={this.props.config.default_is_url}
                     registrationUrl={this.props.registrationUrl}
                     onLoggedIn={this.onRegistered}
                     onLoginClick={this.onLoginClick} />
@@ -659,8 +659,8 @@ module.exports = React.createClass({
                 <Login
                     onLoggedIn={this.onLoggedIn}
                     onRegisterClick={this.onRegisterClick}
-                    homeserverUrl={config.default_hs_url}
-                    identityServerUrl={config.default_is_url} />
+                    homeserverUrl={this.props.config.default_hs_url}
+                    identityServerUrl={this.props.config.default_is_url} />
             );
         }
     }
diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 4fffcaf7cf..e3ec87f8f2 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -39,7 +39,7 @@ module.exports = React.createClass({displayName: 'Login',
     getDefaultProps: function() {
         return {
             homeserverUrl: 'https://matrix.org/',
-            identityServerUrl: 'https://vector.im'
+            identityServerUrl: 'https://matrix.org'
         };
     },
 
diff --git a/src/components/views/avatars/MemberAvatar.js b/src/components/views/avatars/MemberAvatar.js
index 4a6c9fb92e..42c2f6ca2d 100644
--- a/src/components/views/avatars/MemberAvatar.js
+++ b/src/components/views/avatars/MemberAvatar.js
@@ -92,9 +92,9 @@ module.exports = React.createClass({
             return (
                 <span className="mx_MemberAvatar" {...this.props}>
                     <span className="mx_MemberAvatar_initial" aria-hidden="true"
-                          style={{ fontSize: (this.props.width * 0.75) + "px",
+                          style={{ fontSize: (this.props.width * 0.65) + "px",
                                    width: this.props.width + "px",
-                                   lineHeight: this.props.height*1.2 + "px" }}>{ initial }</span>
+                                   lineHeight: this.props.height + "px" }}>{ initial }</span>
                     <img className="mx_MemberAvatar_image" src={this.state.imageUrl} title={this.props.member.name}
                          onError={this.onError} width={this.props.width} height={this.props.height} />
                 </span>
diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index 95ec39de2e..2c1de65bcf 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -155,9 +155,9 @@ module.exports = React.createClass({
             return (
                 <span>
                     <span className="mx_RoomAvatar_initial" aria-hidden="true"
-                          style={{ fontSize: (this.props.width * 0.75) + "px",
+                          style={{ fontSize: (this.props.width * 0.65) + "px",
                                    width: this.props.width + "px",
-                                   lineHeight: this.props.height*1.2 + "px" }}>{ initial }</span>
+                                   lineHeight: this.props.height + "px" }}>{ initial }</span>
                     <img className="mx_RoomAvatar" src={this.state.imageUrl}
                             onError={this.onError} style={style} />
                 </span>