diff --git a/Raivo.xcodeproj/project.pbxproj b/Raivo.xcodeproj/project.pbxproj
index 51b0792..f4cb0c3 100644
--- a/Raivo.xcodeproj/project.pbxproj
+++ b/Raivo.xcodeproj/project.pbxproj
@@ -1649,7 +1649,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Raivo/Raivo.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 84;
+				CURRENT_PROJECT_VERSION = 85;
 				DEVELOPMENT_TEAM = 564B4ETY69;
 				INFOPLIST_FILE = "$(SRCROOT)/Raivo/Supporting/Info.plist";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
@@ -1658,7 +1658,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.4.19;
+				MARKETING_VERSION = 1.4.20;
 				PRODUCT_BUNDLE_IDENTIFIER = com.finnwea.Raivo.Debug;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1676,7 +1676,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Raivo/Raivo.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 84;
+				CURRENT_PROJECT_VERSION = 85;
 				DEVELOPMENT_TEAM = 564B4ETY69;
 				INFOPLIST_FILE = "$(SRCROOT)/Raivo/Supporting/Info.plist";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
@@ -1685,7 +1685,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.4.19;
+				MARKETING_VERSION = 1.4.20;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
diff --git a/Raivo/Controllers/Main/MainEditPasswordViewController.swift b/Raivo/Controllers/Main/MainEditPasswordViewController.swift
index 2bc1700..62e82d5 100644
--- a/Raivo/Controllers/Main/MainEditPasswordViewController.swift
+++ b/Raivo/Controllers/Main/MainEditPasswordViewController.swift
@@ -37,7 +37,7 @@ class MainEditPasswordViewController: FormViewController {
             passwordForm?.counterRow.value = password.counter
             passwordForm?.timerRow.value = password.timer
             
-            if password.syncing {
+            if SyncerHelper.shared.getSyncer().recordsRequireSync && password.syncing {
                 passwordForm?.errorRow.title = "Syncing in progress, but not completed."
                 passwordForm?.synchronizationSection.hidden = false
                 passwordForm?.synchronizationSection.evaluateHidden()
diff --git a/Raivo/Migrations/MigrationToBuild60.swift b/Raivo/Migrations/MigrationToBuild60.swift
index 79e285e..a906839 100644
--- a/Raivo/Migrations/MigrationToBuild60.swift
+++ b/Raivo/Migrations/MigrationToBuild60.swift
@@ -79,9 +79,4 @@ class MigrationToBuild60: MigrationProtocol {
         // Not implemented
     }
     
-    /// Migrate the Valet dependency one major version from v3 to v4.
-    private func migrateValetFromVersion3ToVersion4() {
-        // migrateObjectsFromAlwaysAccessibleValet(removeOnCompletion:)
-    }
-    
 }
diff --git a/Raivo/Views/UIKit/PasswordCell/CounterBasedPasswordCell/CounterBasedPasswordCell.swift b/Raivo/Views/UIKit/PasswordCell/CounterBasedPasswordCell/CounterBasedPasswordCell.swift
index 5867604..dd69103 100644
--- a/Raivo/Views/UIKit/PasswordCell/CounterBasedPasswordCell/CounterBasedPasswordCell.swift
+++ b/Raivo/Views/UIKit/PasswordCell/CounterBasedPasswordCell/CounterBasedPasswordCell.swift
@@ -45,9 +45,9 @@ class CounterBasedPasswordCell: PasswordCell {
         account.text = password.account.count > 0 ? "(" + password.account + ")" : ""
         currentPassword.text = TokenHelper.shared.formatPassword(password.getToken())
         
-        notSyncedView.isHidden = password.synced || password.syncing
-        syncingView.isHidden = password.synced || !password.syncing
-        (!password.synced && password.syncing) ? syncingView.startAnimating() : syncingView.stopAnimating()
+        notSyncedView.isHidden = !SyncerHelper.shared.getSyncer().recordsRequireSync || (password.synced || password.syncing)
+        syncingView.isHidden = !SyncerHelper.shared.getSyncer().recordsRequireSync || (password.synced || !password.syncing)
+        syncingView.isHidden ? syncingView.stopAnimating() : syncingView.startAnimating()
         
         traitCollectionDidChange(nil)
     }
@@ -67,9 +67,9 @@ class CounterBasedPasswordCell: PasswordCell {
         
         currentPassword.text = TokenHelper.shared.formatPassword(password.getToken())
         
-        notSyncedView.isHidden = password.synced || password.syncing
-        syncingView.isHidden = password.synced || !password.syncing
-        (!password.synced && password.syncing) ? syncingView.startAnimating() : syncingView.stopAnimating()
+        notSyncedView.isHidden = !SyncerHelper.shared.getSyncer().recordsRequireSync || (password.synced || password.syncing)
+        syncingView.isHidden = !SyncerHelper.shared.getSyncer().recordsRequireSync || (password.synced || !password.syncing)
+        syncingView.isHidden ? syncingView.stopAnimating() : syncingView.startAnimating()
     }
     
 }
diff --git a/Raivo/Views/UIKit/PasswordCell/TimeBasedPasswordCell/TimeBasedPasswordCell.swift b/Raivo/Views/UIKit/PasswordCell/TimeBasedPasswordCell/TimeBasedPasswordCell.swift
index ddd07c4..31567b2 100644
--- a/Raivo/Views/UIKit/PasswordCell/TimeBasedPasswordCell/TimeBasedPasswordCell.swift
+++ b/Raivo/Views/UIKit/PasswordCell/TimeBasedPasswordCell/TimeBasedPasswordCell.swift
@@ -69,9 +69,9 @@ class TimeBasedPasswordCell: PasswordCell {
         currentPassword.text = TokenHelper.shared.formatPassword(password.getToken())
         updatePreviousPassword(password)
         
-        notSyncedView.isHidden = password.synced || password.syncing
-        syncingView.isHidden = password.synced || !password.syncing
-        (!password.synced && password.syncing) ? syncingView.startAnimating() : syncingView.stopAnimating()
+        notSyncedView.isHidden = !SyncerHelper.shared.getSyncer().recordsRequireSync || (password.synced || password.syncing)
+        syncingView.isHidden = !SyncerHelper.shared.getSyncer().recordsRequireSync || (password.synced || !password.syncing)
+        syncingView.isHidden ? syncingView.stopAnimating() : syncingView.startAnimating()
         
         progressView.transform = CGAffineTransform(rotationAngle: CGFloat.pi)
         
@@ -105,9 +105,9 @@ class TimeBasedPasswordCell: PasswordCell {
         currentPassword.text = TokenHelper.shared.formatPassword(password.getToken())
         updatePreviousPassword(password)
         
-        notSyncedView.isHidden = password.synced || password.syncing
-        syncingView.isHidden = password.synced || !password.syncing
-        (!password.synced && password.syncing) ? syncingView.startAnimating() : syncingView.stopAnimating()
+        notSyncedView.isHidden = !SyncerHelper.shared.getSyncer().recordsRequireSync || (password.synced || password.syncing)
+        syncingView.isHidden = !SyncerHelper.shared.getSyncer().recordsRequireSync || (password.synced || !password.syncing)
+        syncingView.isHidden ? syncingView.stopAnimating() : syncingView.startAnimating()
         
         let timer = TimeInterval(password.timer)
         let epoch = Date().timeIntervalSince1970