diff --git a/iOS/Account/FeedWranglerAccountViewController.swift b/iOS/Account/FeedWranglerAccountViewController.swift
index eeb2e8551..a879a5aba 100644
--- a/iOS/Account/FeedWranglerAccountViewController.swift
+++ b/iOS/Account/FeedWranglerAccountViewController.swift
@@ -78,17 +78,17 @@ class FeedWranglerAccountViewController: UITableViewController {
 			showError(NSLocalizedString("Username & password required.", comment: "Credentials Error"))
 			return
 		}
-	
-		startAnimatingActivityIndicator()
-		disableNavigation()
+		resignFirstResponder()
+		toggleActivityIndicatorAnimation(visible: true)
+		setNavigationEnabled(to: false)
 		
 		// When you fill in the email address via auto-complete it adds extra whitespace
 		let trimmedEmail = email.trimmingCharacters(in: .whitespaces)
 		let credentials = Credentials(type: .feedWranglerBasic, username: trimmedEmail, secret: password)
 		Account.validateCredentials(type: .feedWrangler, credentials: credentials) { result in
 			
-			self.stopAnimtatingActivityIndicator()
-			self.enableNavigation()
+			self.toggleActivityIndicatorAnimation(visible: false)
+			self.setNavigationEnabled(to: true)
 			
 			switch result {
 			case .success(let validatedCredentials):
@@ -138,27 +138,21 @@ class FeedWranglerAccountViewController: UITableViewController {
 	}
 	
 	private func showError(_ message: String) {
-		presentError(title: "Error", message: message)
+		presentError(title: NSLocalizedString("Error", comment: "Credentials Error"), message: message)
 	}
 	
-	private func enableNavigation() {
-		self.cancelBarButtonItem.isEnabled = true
-		self.actionButton.isEnabled = true
+	private func setNavigationEnabled(to value:Bool){
+		cancelBarButtonItem.isEnabled = value
+		actionButton.isEnabled = value
 	}
 	
-	private func disableNavigation() {
-		cancelBarButtonItem.isEnabled = false
-		actionButton.isEnabled = false
-	}
-	
-	private func startAnimatingActivityIndicator() {
-		activityIndicator.isHidden = false
-		activityIndicator.startAnimating()
-	}
-	
-	private func stopAnimtatingActivityIndicator() {
-		self.activityIndicator.isHidden = true
-		self.activityIndicator.stopAnimating()
+	private func toggleActivityIndicatorAnimation(visible value: Bool){
+		activityIndicator.isHidden = !value
+		if value {
+			activityIndicator.startAnimating()
+		} else {
+			activityIndicator.stopAnimating()
+		}
 	}
 		
 }
diff --git a/iOS/Account/FeedbinAccountViewController.swift b/iOS/Account/FeedbinAccountViewController.swift
index a0d4ea759..e47d9aaef 100644
--- a/iOS/Account/FeedbinAccountViewController.swift
+++ b/iOS/Account/FeedbinAccountViewController.swift
@@ -79,17 +79,16 @@ class FeedbinAccountViewController: UITableViewController {
 			showError(NSLocalizedString("Username & password required.", comment: "Credentials Error"))
 			return
 		}
-	
-		startAnimatingActivityIndicator()
-		disableNavigation()
+		resignFirstResponder()
+		toggleActivityIndicatorAnimation(visible: true)
+		setNavigationEnabled(to: false)
 		
 		// When you fill in the email address via auto-complete it adds extra whitespace
 		let trimmedEmail = email.trimmingCharacters(in: .whitespaces)
 		let credentials = Credentials(type: .basic, username: trimmedEmail, secret: password)
 		Account.validateCredentials(type: .feedbin, credentials: credentials) { result in
-			
-			self.stopAnimtatingActivityIndicator()
-			self.enableNavigation()
+			self.toggleActivityIndicatorAnimation(visible: false)
+			self.setNavigationEnabled(to: true)
 			
 			switch result {
 			case .success(let credentials):
@@ -138,27 +137,21 @@ class FeedbinAccountViewController: UITableViewController {
 	}
 	
 	private func showError(_ message: String) {
-		presentError(title: "Error", message: message)
+		presentError(title: NSLocalizedString("Error", comment: "Credentials Error"), message: message)
 	}
 	
-	private func enableNavigation() {
-		self.cancelBarButtonItem.isEnabled = true
-		self.actionButton.isEnabled = true
+	private func setNavigationEnabled(to value:Bool){
+		cancelBarButtonItem.isEnabled = value
+		actionButton.isEnabled = value
 	}
 	
-	private func disableNavigation() {
-		cancelBarButtonItem.isEnabled = false
-		actionButton.isEnabled = false
-	}
-	
-	private func startAnimatingActivityIndicator() {
-		activityIndicator.isHidden = false
-		activityIndicator.startAnimating()
-	}
-	
-	private func stopAnimtatingActivityIndicator() {
-		self.activityIndicator.isHidden = true
-		self.activityIndicator.stopAnimating()
+	private func toggleActivityIndicatorAnimation(visible value: Bool){
+		activityIndicator.isHidden = !value
+		if value {
+			activityIndicator.startAnimating()
+		} else {
+			activityIndicator.stopAnimating()
+		}
 	}
 		
 }