diff --git a/src/components/views/rooms/MemberDeviceInfo.js b/src/components/views/rooms/MemberDeviceInfo.js
index efc2cdf6383..22bbdd2ce7a 100644
--- a/src/components/views/rooms/MemberDeviceInfo.js
+++ b/src/components/views/rooms/MemberDeviceInfo.js
@@ -99,12 +99,16 @@ export default class MemberDeviceInfo extends React.Component {
             );
         }
 
-        var deviceName = this.props.device.display_name || this.props.device.deviceId;
+        var deviceName = this.props.device.getDisplayName() || this.props.device.deviceId;
 
+        // add the deviceId as a titletext to help with debugging
         return (
-            <div className="mx_MemberDeviceInfo">
+            <div className="mx_MemberDeviceInfo" title={this.props.device.deviceId}>
                 <div className="mx_MemberDeviceInfo_deviceId">{deviceName}</div>
                 {indicator}
+                <div className="mx_MemberDeviceInfo_deviceKey">
+                    {this.props.device.getFingerprint()}
+                </div>
                 {verifyButton}
                 {blockButton}
             </div>