diff --git a/UWPX_UI/Controls/Settings/AccountOmemoInfoControl.xaml b/UWPX_UI/Controls/Settings/AccountOmemoInfoControl.xaml
index e7c10c880..099129b5b 100644
--- a/UWPX_UI/Controls/Settings/AccountOmemoInfoControl.xaml
+++ b/UWPX_UI/Controls/Settings/AccountOmemoInfoControl.xaml
@@ -14,7 +14,9 @@
         <omemo:OmemoDeviceIdStringValueConverter x:Key="OmemoDeviceIdStringValueConverter"/>
     </UserControl.Resources>
 
-    <ScrollViewer HorizontalScrollMode="Disabled">
+    <ScrollViewer Margin="0,0,-10,0"
+                  Padding="0,0,10,0"
+                  HorizontalScrollMode="Disabled">
         <StackPanel>
             <TextBlock>
                 <Run FontWeight="Bold"
diff --git a/UWPX_UI_Context/Classes/DataTemplates/Controls/OmemoFingerprintControlDataTemplate.cs b/UWPX_UI_Context/Classes/DataTemplates/Controls/OmemoFingerprintControlDataTemplate.cs
index 2508f8a5b..ed51949f9 100644
--- a/UWPX_UI_Context/Classes/DataTemplates/Controls/OmemoFingerprintControlDataTemplate.cs
+++ b/UWPX_UI_Context/Classes/DataTemplates/Controls/OmemoFingerprintControlDataTemplate.cs
@@ -14,6 +14,12 @@ public string Fingerprint
             get { return _Fingerprint; }
             set { SetProperty(ref _Fingerprint, value); }
         }
+        private string _QrCodeFingerprint;
+        public string QrCodeFingerprint
+        {
+            get { return _QrCodeFingerprint; }
+            set { SetProperty(ref _QrCodeFingerprint, value); }
+        }
 
         #endregion
         //--------------------------------------------------------Constructor:----------------------------------------------------------------\\
@@ -36,14 +42,17 @@ public void UpdateView(AccountDataTemplate account)
                 if (!(key is null))
                 {
                     Fingerprint = CryptoUtils.genOmemoFingerprint(key);
-                    return;
+                    QrCodeFingerprint = CryptoUtils.genOmemoQrCodeFingerprint(key, account.Account);
                 }
                 else
                 {
                     Fingerprint = "Failed to load fingerprint!";
+                    QrCodeFingerprint = null;
                 }
+                return;
             }
             Fingerprint = "";
+            QrCodeFingerprint = null;
         }
 
         #endregion
diff --git a/XMPP_API/Classes/Crypto/CryptoUtils.cs b/XMPP_API/Classes/Crypto/CryptoUtils.cs
index d8fa51f0c..f18bc4278 100644
--- a/XMPP_API/Classes/Crypto/CryptoUtils.cs
+++ b/XMPP_API/Classes/Crypto/CryptoUtils.cs
@@ -12,6 +12,7 @@
 using Windows.Security.Cryptography;
 using Windows.Security.Cryptography.Core;
 using Windows.Storage.Streams;
+using XMPP_API.Classes.Network;
 
 namespace XMPP_API.Classes.Crypto
 {
@@ -153,6 +154,23 @@ public static string genOmemoFingerprint(IdentityKey key)
             return Regex.Replace(fingerprint, ".{8}", "$0 ");
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="account"></param>
+        /// <returns></returns>
+        public static string genOmemoQrCodeFingerprint(IdentityKey key, XMPPAccount account)
+        {
+            StringBuilder sb = new StringBuilder("xmpp:");
+            sb.Append(account.getIdAndDomain());
+            sb.Append("?omemo-sid-");
+            sb.Append(account.omemoDeviceId);
+            sb.Append('=');
+            sb.Append(byteArrayToHexString(key.serialize()));
+            return sb.ToString();
+        }
+
         public static void nextBytesSecureRandom(out byte[] b, in uint length)
         {
             IBuffer buf = CryptographicBuffer.GenerateRandom(length);