diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec
index b87327c72..916e6651e 100644
--- a/WordPressAuthenticator.podspec
+++ b/WordPressAuthenticator.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressAuthenticator"
-  s.version       = "1.31.0-beta.3"
+  s.version       = "1.31.0-beta.4"
   s.summary       = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
 
   s.description   = <<-DESC
diff --git a/WordPressAuthenticator/Authenticator/WordPressAuthenticatorDelegateProtocol.swift b/WordPressAuthenticator/Authenticator/WordPressAuthenticatorDelegateProtocol.swift
index e2c4d5e79..2e684e3f3 100644
--- a/WordPressAuthenticator/Authenticator/WordPressAuthenticatorDelegateProtocol.swift
+++ b/WordPressAuthenticator/Authenticator/WordPressAuthenticatorDelegateProtocol.swift
@@ -12,6 +12,10 @@ public protocol WordPressAuthenticatorDelegate: class {
     ///
     var supportActionEnabled: Bool { get }
 
+    /// Indicates if the WordPress.com's Terms of Service should be enabled, or not.
+    ///
+    var wpcomTermsOfServiceEnabled: Bool { get }
+
     /// Indicates if the Support notification indicator should be displayed.
     ///
     var showSupportNotificationIndicator: Bool { get }
diff --git a/WordPressAuthenticator/Unified Auth/View Related/Get Started/GetStartedViewController.swift b/WordPressAuthenticator/Unified Auth/View Related/Get Started/GetStartedViewController.swift
index ddbc41a8c..a4a9525aa 100644
--- a/WordPressAuthenticator/Unified Auth/View Related/Get Started/GetStartedViewController.swift	
+++ b/WordPressAuthenticator/Unified Auth/View Related/Get Started/GetStartedViewController.swift	
@@ -206,7 +206,11 @@ private extension GetStartedViewController {
     /// Describes how the tableView rows should be rendered.
     ///
     func loadRows() {
-        rows = [.instructions, .email, .tos]
+        rows = [.instructions, .email]
+
+        if let authenticationDelegate = WordPressAuthenticator.shared.delegate, authenticationDelegate.wpcomTermsOfServiceEnabled {
+            rows.append(.tos)
+        }
         
         if let errorText = errorMessage, !errorText.isEmpty {
             rows.append(.errorMessage)