diff --git a/src/App/Pages/Vault/AddEditPage.xaml b/src/App/Pages/Vault/AddEditPage.xaml
index 131a8e810..ef417649e 100644
--- a/src/App/Pages/Vault/AddEditPage.xaml
+++ b/src/App/Pages/Vault/AddEditPage.xaml
@@ -38,7 +38,7 @@
                         Text="{u:I18n Name}"
                         StyleClass="box-label" />
                     <Entry
-                        Text="{Binding Cipher.Name, Mode=OneWay}"
+                        Text="{Binding Cipher.Name}"
                         StyleClass="box-value" />
                 </StackLayout>
             </StackLayout>
diff --git a/src/Core/Services/CipherService.cs b/src/Core/Services/CipherService.cs
index fd1f54cbe..dfdf554e7 100644
--- a/src/Core/Services/CipherService.cs
+++ b/src/Core/Services/CipherService.cs
@@ -65,7 +65,7 @@ namespace Bit.Core.Services
             {
                 if(value == null)
                 {
-                    _decryptedCipherCache.Clear();
+                    _decryptedCipherCache?.Clear();
                 }
                 _decryptedCipherCache = value;
                 if(_searchService != null)
@@ -120,7 +120,7 @@ namespace Bit.Core.Services
                         }
                         else
                         {
-                            model.Login.PasswordRevisionDate = DateTime.UtcNow;
+                            model.Login.PasswordRevisionDate = existingCipher.Login.PasswordRevisionDate;
                         }
                     }
                     if(existingCipher.HasFields)
@@ -951,6 +951,7 @@ namespace Bit.Core.Services
             if(!attachmentsModel?.Any() ?? true)
             {
                 cipher.Attachments = null;
+                return;
             }
             var tasks = new List<Task>();
             var encAttachments = new List<Attachment>();
@@ -1098,6 +1099,7 @@ namespace Bit.Core.Services
             if(!phModels?.Any() ?? true)
             {
                 cipher.PasswordHistory = null;
+                return;
             }
             var tasks = new List<Task>();
             var encPhs = new List<PasswordHistory>();