diff --git a/src/App/Pages/Vault/CipherAddEditPage.xaml b/src/App/Pages/Vault/CipherAddEditPage.xaml
index e5f5f968b..db6b349e8 100644
--- a/src/App/Pages/Vault/CipherAddEditPage.xaml
+++ b/src/App/Pages/Vault/CipherAddEditPage.xaml
@@ -212,14 +212,12 @@
                         Text="{u:I18n Passkey}"
                         StyleClass="box-label"
                         Margin="0,10,0,0"
-                        IsVisible="{Binding ShowPasskeyCreationDate}"/>
-                    <!--TODO: Update binding to display the true creation date of the login's Fido2Key.
-                              For now, displaying the creation date of the cipher to check the UI-->
+                        IsVisible="{Binding ShowPasskeyInfo}"/>
                     <Entry
-                        Text="{Binding CreationDate}"
+                        Text="{u:I18n AvailableForTwoStepLogin}"
                         IsEnabled="False"
                         StyleClass="box-value,text-muted"
-                        IsVisible="{Binding ShowPasskeyCreationDate}" />
+                        IsVisible="{Binding ShowPasskeyInfo}" />
 
                     <Grid StyleClass="box-row, box-row-input">
                         <Grid.RowDefinitions>
diff --git a/src/App/Pages/Vault/CipherAddEditPageViewModel.cs b/src/App/Pages/Vault/CipherAddEditPageViewModel.cs
index e51ba139c..eb7519ecc 100644
--- a/src/App/Pages/Vault/CipherAddEditPageViewModel.cs
+++ b/src/App/Pages/Vault/CipherAddEditPageViewModel.cs
@@ -309,7 +309,7 @@ namespace Bit.App.Pages
         public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
         public bool HasTotpValue => IsLogin && !string.IsNullOrEmpty(Cipher?.Login?.Totp);
         public string SetupTotpText => $"{BitwardenIcons.Camera} {AppResources.SetupTotp}";
-        public bool ShowPasskeyCreationDate => Cipher?.Login?.Fido2Key != null && !CloneMode;
+        public bool ShowPasskeyInfo => Cipher?.Login?.Fido2Key != null && !CloneMode;
 
         public void Init()
         {
diff --git a/src/App/Pages/Vault/CipherDetailsPage.xaml b/src/App/Pages/Vault/CipherDetailsPage.xaml
index 4652c1cab..962ec332c 100644
--- a/src/App/Pages/Vault/CipherDetailsPage.xaml
+++ b/src/App/Pages/Vault/CipherDetailsPage.xaml
@@ -186,12 +186,12 @@
                                 Text="{u:I18n Passkey}"
                                 StyleClass="box-label"
                                 Margin="0,10,0,0"
-                                IsVisible="{Binding Cipher.Login.Fido2Key}"/>
+                                IsVisible="{Binding Cipher.Login.Fido2Key, Converter={StaticResource notNull}}"/>
                             <Entry
                                 Text="{u:I18n AvailableForTwoStepLogin}"
                                 IsEnabled="False"
                                 StyleClass="box-value,text-muted"
-                                IsVisible="{Binding Cipher.Login.Fido2Key}" />
+                                IsVisible="{Binding Cipher.Login.Fido2Key, Converter={StaticResource notNull}}" />
                             <Grid StyleClass="box-row" IsVisible="{Binding ShowTotp}">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="Auto" />