diff --git a/CHANGES.md b/CHANGES.md
index 9887531da..9719d6984 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,11 +4,14 @@
 
 - M4A and WEBM files when sent as XEP-0066 Out of Band Data, are now playable directly in chat
 - OMEMO fixes for Edge.
+- #1187 UTF-8 characters have the wrong encoding when using OMEMO
+- #1189 Video playback failure
 - #1220 Converse not working in Edge
+- #1225 User profile sometimes not displayed when libsignal-protocol.js is used
 
 ## 4.0.1 (2018-09-19)
 
-- Use https://compliance.conversations.im instead of (dead) https://xmpp.net
+- Use https://compliance.conversations.im instead of dead link tot st https://xmpp.net
 - New config  setting [auto_register_muc_nickname](https://conversejs.org/docs/html/configuration.html#auto-register-muc-nickname)
 - New config setting [enable_muc_push](https://conversejs.org/docs/html/configuration.html#enable-muc-push)
 - #1182 MUC occupants without nick or JID created
diff --git a/dist/converse.js b/dist/converse.js
index 1e1e71d15..11cb9d17b 100644
--- a/dist/converse.js
+++ b/dist/converse.js
@@ -80475,13 +80475,13 @@ __e(o.__('Save and close')) +
  if (o._converse.pluggable.plugins['converse-omemo'].enabled(o._converse)) { ;
 __p += '\n                        <div class="tab-pane fade" id="omemo-tabpanel" role="tabpanel" aria-labelledby="omemo-tab">\n                            <form class="converse-form fingerprint-removal">\n                                <ul class="list-group fingerprints">\n                                    <li class="list-group-item active">' +
 __e(o.__("This device's OMEMO fingerprint")) +
-'</li>\n                                    <li class="list-group-item">\n                                        ';
- if (o.view.current_device.get('bundle') && o.view.current_device.get('bundle').fingerprint) { ;
+'</li>\n                                    <li class="list-group-item">\n                                    ';
+ if (o.view.current_device && o.view.current_device.get('bundle') && o.view.current_device.get('bundle').fingerprint) { ;
 __p += '\n                                        <span class="fingerprint">' +
 __e(o.utils.formatFingerprint(o.view.current_device.get('bundle').fingerprint)) +
-'</span>\n                                        ';
+'</span>\n                                    ';
  } else {;
-__p += '\n                                            <span class="spinner fa fa-spinner centered"/>\n                                        ';
+__p += '\n                                        <span class="spinner fa fa-spinner centered"/>\n                                    ';
  } ;
 __p += '\n                                    </li>\n                                </ul>\n                                ';
  if (o.view.other_devices.length) { ;
diff --git a/src/templates/profile_modal.html b/src/templates/profile_modal.html
index 8b520119b..931cc5d5f 100644
--- a/src/templates/profile_modal.html
+++ b/src/templates/profile_modal.html
@@ -71,11 +71,11 @@
                                 <ul class="list-group fingerprints">
                                     <li class="list-group-item active">{{{o.__("This device's OMEMO fingerprint")}}}</li>
                                     <li class="list-group-item">
-                                        {[ if (o.view.current_device.get('bundle') && o.view.current_device.get('bundle').fingerprint) { ]}
+                                    {[ if (o.view.current_device && o.view.current_device.get('bundle') && o.view.current_device.get('bundle').fingerprint) { ]}
                                         <span class="fingerprint">{{{o.utils.formatFingerprint(o.view.current_device.get('bundle').fingerprint)}}}</span>
-                                        {[ } else {]}
-                                            <span class="spinner fa fa-spinner centered"/>
-                                        {[ } ]}
+                                    {[ } else {]}
+                                        <span class="spinner fa fa-spinner centered"/>
+                                    {[ } ]}
                                     </li>
                                 </ul>
                                 {[ if (o.view.other_devices.length) { ]}