diff --git a/iOS/Settings/SettingsFeedbinAccountView.swift b/iOS/Settings/SettingsFeedbinAccountView.swift
index 1b3f370fb..62e88069a 100644
--- a/iOS/Settings/SettingsFeedbinAccountView.swift
+++ b/iOS/Settings/SettingsFeedbinAccountView.swift
@@ -93,7 +93,7 @@ struct SettingsFeedbinAccountView : View {
 					do {
 						
 						do {
-							try workAccount.removeBasicCredentials()
+							try workAccount.removeCredentials()
 						} catch {}
 						try workAccount.storeCredentials(credentials)
 						
@@ -132,7 +132,7 @@ struct SettingsFeedbinAccountView : View {
 		
 		init(account: Account) {
 			self.account = account
-			if case .basic(let username, let password) = try? account.retrieveBasicCredentials() {
+			if case .basic(let username, let password) = try? account.retrieveCredentials() {
 				self.email = username
 				self.password = password
 			}
diff --git a/iOS/Settings/SettingsReaderAPIAccountView.swift b/iOS/Settings/SettingsReaderAPIAccountView.swift
index 6880518c3..0f4f4f2d5 100644
--- a/iOS/Settings/SettingsReaderAPIAccountView.swift
+++ b/iOS/Settings/SettingsReaderAPIAccountView.swift
@@ -104,7 +104,7 @@ struct SettingsReaderAPIAccountView : View {
 					do {
 						
 						do {
-							try workAccount.removeBasicCredentials()
+							try workAccount.removeCredentials()
 						} catch {}
 						
 						workAccount.endpointURL = apiURL
@@ -149,7 +149,7 @@ struct SettingsReaderAPIAccountView : View {
 		init(accountType: AccountType, account: Account) {
 			self.account = account
 			self.accountType = accountType
-			if case .basic(let username, let password) = try? account.retrieveBasicCredentials() {
+			if case .basic(let username, let password) = try? account.retrieveCredentials() {
 				self.email = username
 				self.password = password
 			}
diff --git a/iOS/Settings/UIKit/FeedbinAccountViewController.swift b/iOS/Settings/UIKit/FeedbinAccountViewController.swift
index 3cbf24bea..10ca43c82 100644
--- a/iOS/Settings/UIKit/FeedbinAccountViewController.swift
+++ b/iOS/Settings/UIKit/FeedbinAccountViewController.swift
@@ -30,7 +30,7 @@ class FeedbinAccountViewController: UIViewController {
 		emailTextField.delegate = self
 		passwordTextField.delegate = self
 		
-		if let account = account, let credentials = try? account.retrieveBasicCredentials() {
+		if let account = account, let credentials = try? account.retrieveCredentials() {
 			actionButton.setTitle(NSLocalizedString("Update Credentials", comment: "Update Credentials"), for: .normal)
 			if case .basic(let username, let password) = credentials {
 				emailTextField.text = username
@@ -77,7 +77,7 @@ class FeedbinAccountViewController: UIViewController {
 					do {
 						
 						do {
-							try self.account?.removeBasicCredentials()
+							try self.account?.removeCredentials()
 						} catch {}
 						try self.account?.storeCredentials(credentials)