diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec
index 2777d5b21..d5a7c81c8 100644
--- a/WordPressAuthenticator.podspec
+++ b/WordPressAuthenticator.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressAuthenticator"
-  s.version       = "1.10.4"
+  s.version       = "1.10.5-beta.1"
   s.summary       = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
 
   s.description   = <<-DESC
diff --git a/WordPressAuthenticator/Extensions/WPStyleGuide+Login.swift b/WordPressAuthenticator/Extensions/WPStyleGuide+Login.swift
index e91513e7f..29c086e88 100644
--- a/WordPressAuthenticator/Extensions/WPStyleGuide+Login.swift
+++ b/WordPressAuthenticator/Extensions/WPStyleGuide+Login.swift
@@ -71,6 +71,13 @@ extension WPStyleGuide {
         onePasswordButton.addTarget(target, action: selector, for: .touchUpInside)
     }
 
+    /// Configures a plain text button with default styles.
+    ///
+    class func configureTextButton(_ button: UIButton) {
+        button.setTitleColor(WordPressAuthenticator.shared.style.textButtonColor, for: .normal)
+        button.setTitleColor(WordPressAuthenticator.shared.style.textButtonHighlightColor, for: .highlighted)
+    }
+
     ///
     ///
     class func colorForErrorView(_ opaque: Bool) -> UIColor {
diff --git a/WordPressAuthenticator/Signin/Login2FAViewController.swift b/WordPressAuthenticator/Signin/Login2FAViewController.swift
index 9f0a840b8..0692b550e 100644
--- a/WordPressAuthenticator/Signin/Login2FAViewController.swift
+++ b/WordPressAuthenticator/Signin/Login2FAViewController.swift
@@ -78,6 +78,7 @@ class Login2FAViewController: LoginViewController, NUXKeyboardResponder, UITextF
     private func styleSendCodeButton() {
         sendCodeButton.titleLabel?.adjustsFontForContentSizeCategory = true
         sendCodeButton.titleLabel?.adjustsFontSizeToFitWidth = true
+        WPStyleGuide.configureTextButton(sendCodeButton)
     }
 
     // MARK: Configuration Methods
diff --git a/WordPressAuthenticator/Signin/LoginEmailViewController.swift b/WordPressAuthenticator/Signin/LoginEmailViewController.swift
index 5cf2ef07a..d0619b71b 100644
--- a/WordPressAuthenticator/Signin/LoginEmailViewController.swift
+++ b/WordPressAuthenticator/Signin/LoginEmailViewController.swift
@@ -71,6 +71,7 @@ open class LoginEmailViewController: LoginViewController, NUXKeyboardResponder {
         loginFields.meta.userIsDotCom = true
 
         configureEmailField()
+        configureAlternativeLabel()
         configureSubmitButton()
         configureViewForEditingIfNeeded()
         configureForWPComOnlyIfNeeded()
diff --git a/WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift b/WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift
index ca4fef406..e7a58d181 100644
--- a/WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift
+++ b/WordPressAuthenticator/Signin/LoginLinkRequestViewController.swift
@@ -25,6 +25,7 @@ class LoginLinkRequestViewController: LoginViewController {
         super.viewDidLoad()
 
         localizeControls()
+        configureUsePasswordButton()
 
         let email = loginFields.username
         if !email.isValidEmail() {
@@ -78,6 +79,13 @@ class LoginLinkRequestViewController: LoginViewController {
         sendLinkButton?.isEnabled = !animating
     }
 
+    private func configureUsePasswordButton() {
+        guard let usePasswordButton = usePasswordButton else {
+            return
+        }
+        WPStyleGuide.configureTextButton(usePasswordButton)
+    }
+
 
     // MARK: - Instance Methods
 
diff --git a/WordPressAuthenticator/Signin/LoginSelfHostedViewController.swift b/WordPressAuthenticator/Signin/LoginSelfHostedViewController.swift
index 292c0fbb4..8db550889 100644
--- a/WordPressAuthenticator/Signin/LoginSelfHostedViewController.swift
+++ b/WordPressAuthenticator/Signin/LoginSelfHostedViewController.swift
@@ -113,6 +113,7 @@ class LoginSelfHostedViewController: LoginViewController, NUXKeyboardResponder {
     ///
     @objc func configureForgotPasswordButton() {
         forgotPasswordButton.isEnabled = enableSubmit(animating: false)
+        WPStyleGuide.configureTextButton(forgotPasswordButton)
     }
 
 
diff --git a/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift b/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift
index b878083c7..e51faf76b 100644
--- a/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift
+++ b/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift
@@ -47,6 +47,7 @@ class LoginSiteAddressViewController: LoginViewController, NUXKeyboardResponder
         loginFields.meta.userIsDotCom = false
 
         configureTextFields()
+        configureSiteAddressHelpButton()
         configureSubmitButton(animating: false)
         configureViewForEditingIfNeeded()
 
@@ -132,6 +133,10 @@ class LoginSiteAddressViewController: LoginViewController, NUXKeyboardResponder
         }
     }
 
+    private func configureSiteAddressHelpButton() {
+        WPStyleGuide.configureTextButton(siteAddressHelpButton)
+    }
+
 
     // MARK: - Instance Methods
 
diff --git a/WordPressAuthenticator/Signin/LoginUsernamePasswordViewController.swift b/WordPressAuthenticator/Signin/LoginUsernamePasswordViewController.swift
index ae700c767..6c65d1bb9 100644
--- a/WordPressAuthenticator/Signin/LoginUsernamePasswordViewController.swift
+++ b/WordPressAuthenticator/Signin/LoginUsernamePasswordViewController.swift
@@ -113,6 +113,7 @@ class LoginUsernamePasswordViewController: LoginViewController, NUXKeyboardRespo
     ///
     @objc func configureForgotPasswordButton() {
         forgotPasswordButton.isEnabled = enableSubmit(animating: false)
+        WPStyleGuide.configureTextButton(forgotPasswordButton)
     }
 
 
diff --git a/WordPressAuthenticator/Signin/LoginWPComViewController.swift b/WordPressAuthenticator/Signin/LoginWPComViewController.swift
index 9add6ab27..6a420ba33 100644
--- a/WordPressAuthenticator/Signin/LoginWPComViewController.swift
+++ b/WordPressAuthenticator/Signin/LoginWPComViewController.swift
@@ -45,6 +45,7 @@ class LoginWPComViewController: LoginViewController, NUXKeyboardResponder {
 
         configureTextFields()
         configureEmailIcon()
+        configureForgotPasswordButton()
         configureSubmitButton(animating: false)
         configureViewForEditingIfNeeded()
     }
@@ -128,6 +129,13 @@ class LoginWPComViewController: LoginViewController, NUXKeyboardResponder {
         emailIcon?.image = image.imageWithTintColor(WordPressAuthenticator.shared.style.subheadlineColor)
     }
 
+    private func configureForgotPasswordButton() {
+        guard let forgotPasswordButton = forgotPasswordButton else {
+            return
+        }
+        WPStyleGuide.configureTextButton(forgotPasswordButton)
+    }
+
     @objc func localizeControls() {
 
         instructionLabel?.text = {