diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt
index d0174a9a..19b71b72 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt
@@ -235,14 +235,14 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
                                 crypto_copy_username.setOnClickListener { copyUsernameToClipBoard(entry.username) }
                                 crypto_username_show.typeface = monoTypeface
                                 crypto_username_show.text = entry.username
-                            } else {
-                                crypto_username_show.visibility = View.GONE
-                                crypto_username_show_label.visibility = View.GONE
-                                crypto_copy_username.visibility = View.GONE
                             }
                         }
 
                         if (entry.hasTotp()) {
+                            crypto_extra_show_layout.visibility = View.VISIBLE
+                            crypto_extra_show.typeface = monoTypeface
+                            crypto_extra_show.text = entry.extraContent
+
                             crypto_totp_show.visibility = View.VISIBLE
                             crypto_totp_show_label.visibility = View.VISIBLE
                             crypto_copy_totp.visibility = View.VISIBLE
diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml
index 1fde3b79..48247c57 100644
--- a/app/src/main/res/layout/decrypt_layout.xml
+++ b/app/src/main/res/layout/decrypt_layout.xml
@@ -132,6 +132,7 @@
                     android:layout_alignParentTop="true"
                     android:layout_toLeftOf="@id/crypto_copy_username"
                     android:layout_toStartOf="@id/crypto_copy_username"
+                    android:visibility="invisible"
                     android:text="@string/username"
                     android:textColor="@android:color/black"
                     android:textStyle="bold" />
@@ -145,6 +146,7 @@
                     android:layout_below="@id/crypto_username_show_label"
                     android:layout_toLeftOf="@id/crypto_copy_username"
                     android:layout_toStartOf="@id/crypto_copy_username"
+                    android:visibility="invisible"
                     android:textColor="@android:color/black"
                     android:textIsSelectable="true"
                     android:typeface="monospace" />
@@ -156,6 +158,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_alignParentEnd="true"
                     android:layout_alignParentTop="true"
+                    android:visibility="invisible"
                     android:contentDescription="@string/copy_username"
                     android:background="@color/background"
                     android:src="@drawable/ic_content_copy"/>