diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 22ac7c7c72..714566e94c 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -511,6 +511,14 @@ module.exports = React.createClass({
             </div>);
         }
 
+        var olmVersion = MatrixClientPeg.get().olmVersion;
+        // If the olmVersion is not defined then either crypto is disabled, or
+        // we are using a version old version of olm. We assume the former.
+        var olmVersionString = "<not-enabled>";
+        if (olmVersion !== undefined) {
+            olmVersionString = olmVersion[0] + "." + olmVersion[1] + "." + olmVersion[2];
+        }
+
         return (
             <div className="mx_UserSettings">
                 <SimpleRoomHeader
@@ -586,6 +594,7 @@ module.exports = React.createClass({
                     <div className="mx_UserSettings_advanced">
                         matrix-react-sdk version: {REACT_SDK_VERSION}<br/>
                         vector-web version: {this.props.version}<br/>
+                        olm version: {olmVersionString}<br/>
                     </div>
                 </div>