diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec
index d858a2ef1..9413f316c 100644
--- a/WordPressAuthenticator.podspec
+++ b/WordPressAuthenticator.podspec
@@ -2,7 +2,7 @@
 
 Pod::Spec.new do |s|
   s.name          = 'WordPressAuthenticator'
-  s.version       = '2.2.0-beta.2'
+  s.version       = '2.2.0-beta.3'
 
   s.summary       = 'WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps.'
   s.description   = <<-DESC
diff --git a/WordPressAuthenticator/Unified Auth/View Related/Reusable Views/TextFieldTableViewCell.swift b/WordPressAuthenticator/Unified Auth/View Related/Reusable Views/TextFieldTableViewCell.swift
index c083e5aa4..6a03da34f 100644
--- a/WordPressAuthenticator/Unified Auth/View Related/Reusable Views/TextFieldTableViewCell.swift	
+++ b/WordPressAuthenticator/Unified Auth/View Related/Reusable Views/TextFieldTableViewCell.swift	
@@ -56,7 +56,13 @@ final class TextFieldTableViewCell: UITableViewCell {
     override func prepareForReuse() {
         super.prepareForReuse()
 
+        textField.keyboardType = .default
+        textField.returnKeyType = .default
+        setSecureTextEntry(false)
+        showSecureTextEntryToggle = false
         textField.rightView = nil
+        textField.accessibilityLabel = nil
+        textField.accessibilityIdentifier = nil
     }
 }
 
diff --git a/WordPressAuthenticator/Unified Auth/View Related/Site Address/SiteCredentialsViewController.swift b/WordPressAuthenticator/Unified Auth/View Related/Site Address/SiteCredentialsViewController.swift
index 922e3a4ed..df8e2d403 100644
--- a/WordPressAuthenticator/Unified Auth/View Related/Site Address/SiteCredentialsViewController.swift	
+++ b/WordPressAuthenticator/Unified Auth/View Related/Site Address/SiteCredentialsViewController.swift	
@@ -280,7 +280,8 @@ private extension SiteCredentialsViewController {
     ///
     func configureUsernameTextField(_ cell: TextFieldTableViewCell) {
         cell.configure(withStyle: .username,
-                       placeholder: WordPressAuthenticator.shared.displayStrings.usernamePlaceholder)
+                       placeholder: WordPressAuthenticator.shared.displayStrings.usernamePlaceholder,
+                       text: loginFields.username)
 
         // Save a reference to the textField so it can becomeFirstResponder.
         usernameField = cell.textField
@@ -302,7 +303,8 @@ private extension SiteCredentialsViewController {
     ///
     func configurePasswordTextField(_ cell: TextFieldTableViewCell) {
         cell.configure(withStyle: .password,
-                       placeholder: WordPressAuthenticator.shared.displayStrings.passwordPlaceholder)
+                       placeholder: WordPressAuthenticator.shared.displayStrings.passwordPlaceholder,
+                       text: loginFields.password)
         passwordField = cell.textField
         cell.textField.delegate = self
         cell.onChangeSelectionHandler = { [weak self] textfield in