diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index a9805f9f18..0fb66abc00 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -135,7 +135,7 @@ module.exports = React.createClass({
             if (this.props.invitedEmail) {
                 if (this.state.threePidFetchError) {
                     return MessageCase.OtherThreePIDError;
-                } else if (this.state.invitedEmailMxid != MatrixClientPeg.get().credentials.userId) {
+                } else if (this.state.invitedEmailMxid != MatrixClientPeg.get().getUserId()) {
                     return MessageCase.InvitedEmailMismatch;
                 }
             }
@@ -188,6 +188,20 @@ module.exports = React.createClass({
         }
     },
 
+    _getInviteMember: function() {
+        const {room} = this.props;
+        if (!room) {
+            return;
+        }
+        const myUserId = MatrixClientPeg.get().getUserId();
+        const inviteEvent = room.currentState.getMember(myUserId);
+        if (!inviteEvent) {
+            return;
+        }
+        const inviterUserId = inviteEvent.events.member.getSender();
+        return room.currentState.getMember(inviterUserId);
+    },
+
     onLoginClick: function() {
         dis.dispatch({ action: 'start_login' });
     },
@@ -300,12 +314,24 @@ module.exports = React.createClass({
                 break;
             }
             case MessageCase.Invite: {
+                const inviteMember = this._getInviteMember();
+                let avatar;
+                let memberName;
+                if (inviteMember) {
+                    const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar");
+                    avatar = (<MemberAvatar member={inviteMember} />);
+                    memberName = inviteMember.name;
+                } else {
+                    memberName = this.props.inviterName;
+                }
+
                 if (this.props.canPreview) {
-                    title = _t("%(memberName)s invited you to this room", {memberName: this.props.inviterName});
+                    title = <span>{avatar}{_t("<userName/> invited you to this room", {}, {userName: name => <strong>{memberName}</strong>})}</span>;
                 } else {
                     title = _t("Do you want to join this room?");
-                    subTitle = _t("%(memberName)s invited you", {memberName: this.props.inviterName});
+                    subTitle = <span>{avatar}{_t("<userName/> invited you", {}, {userName: name => <strong>{memberName}</strong>})}</span>;
                 }
+
                 primaryActionLabel = _t("Accept");
                 primaryActionHandler = this.props.onJoinClick;
                 secondaryActionLabel = _t("Reject");
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c156da40bc..5b80ae731d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -810,9 +810,9 @@
     "Try to join anyway": "Try to join anyway",
     "The room invite wasn't sent to your account": "The room invite wasn't sent to your account",
     "Sign in with a different account, ask for another invite, or add the e-mail address %(email)s to this account.": "Sign in with a different account, ask for another invite, or add the e-mail address %(email)s to this account.",
-    "%(memberName)s invited you to this room": "%(memberName)s invited you to this room",
+    "<userName/> invited you to this room": "<userName/> invited you to this room",
     "Do you want to join this room?": "Do you want to join this room?",
-    "%(memberName)s invited you": "%(memberName)s invited you",
+    "<userName/> invited you": "<userName/> invited you",
     "Reject": "Reject",
     "You're previewing this room. Want to join it?": "You're previewing this room. Want to join it?",
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s can't be previewed. Do you want to join it?",