diff --git a/CHANGELOG.md b/CHANGELOG.md
index 850f6dfb..d6bc07e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Added:
 - CLI: The `--dns` switch. To include the DNS challenge for consideration. Supported are the following solvers: cloudflare, digitalocean, dnsimple, route53, rfc2136 and manual.
+- CLI: The `--accept-tos`  switch. Indicates your acceptance of the Let's Encrypt terms of service without prompting you.
 - lib: A new type for challenge identifiers `Challenge`
 - lib: A new interface for custom challenge providers `ChallengeProvider`
 - lib: SetChallengeProvider function. Pass a challenge identifier and a Provider to replace the default behaviour of a challenge.
diff --git a/cli.go b/cli.go
index ba216d07..97d3a816 100644
--- a/cli.go
+++ b/cli.go
@@ -88,6 +88,10 @@ func main() {
 			Name:  "email, m",
 			Usage: "Email used for registration and recovery contact.",
 		},
+		cli.BoolFlag{
+			Name:  "accept-tos, a",
+			Usage: "By setting this flag to true you indicate that you accept the current Let's Encrypt terms of service.",
+		},
 		cli.IntFlag{
 			Name:  "rsa-key-size, B",
 			Value: 2048,
diff --git a/cli_handlers.go b/cli_handlers.go
index fe4f7a80..e6e71cbe 100644
--- a/cli_handlers.go
+++ b/cli_handlers.go
@@ -126,6 +126,47 @@ func saveCertRes(certRes acme.CertificateResource, conf *Configuration) {
 	}
 }
 
+func handleTOS(c *cli.Context, client *acme.Client, acc *Account) {
+	// Check for a global accept override
+	if c.GlobalBool("accept-tos") {
+		err := client.AgreeToTOS()
+		if err != nil {
+			logger().Fatalf("Could not agree to TOS: %s", err.Error())
+		}
+
+		acc.Save()
+		return
+	}
+
+	reader := bufio.NewReader(os.Stdin)
+	logger().Printf("Please review the TOS at %s", acc.Registration.TosURL)
+
+	for {
+		logger().Println("Do you accept the TOS? Y/n")
+		text, err := reader.ReadString('\n')
+		if err != nil {
+			logger().Fatalf("Could not read from console: %s", err.Error())
+		}
+
+		text = strings.Trim(text, "\r\n")
+
+		if text == "n" {
+			logger().Fatal("You did not accept the TOS. Unable to proceed.")
+		}
+
+		if text == "Y" || text == "y" || text == "" {
+			err = client.AgreeToTOS()
+			if err != nil {
+				logger().Fatalf("Could not agree to TOS: %s", err.Error())
+			}
+			acc.Save()
+			break
+		}
+
+		logger().Println("Your input was invalid. Please answer with one of Y/y, n or by pressing enter.")
+	}
+}
+
 func run(c *cli.Context) {
 	conf, acc, client := setup(c)
 	if acc.Registration == nil {
@@ -148,34 +189,9 @@ func run(c *cli.Context) {
 
 	}
 
+	// If the agreement URL is empty, the account still needs to accept the LE TOS.
 	if acc.Registration.Body.Agreement == "" {
-		reader := bufio.NewReader(os.Stdin)
-		logger().Printf("Please review the TOS at %s", acc.Registration.TosURL)
-
-		for {
-			logger().Println("Do you accept the TOS? Y/n")
-			text, err := reader.ReadString('\n')
-			if err != nil {
-				logger().Fatalf("Could not read from console -> %s", err.Error())
-			}
-
-			text = strings.Trim(text, "\r\n")
-
-			if text == "n" {
-				logger().Fatal("You did not accept the TOS. Unable to proceed.")
-			}
-
-			if text == "Y" || text == "y" || text == "" {
-				err = client.AgreeToTOS()
-				if err != nil {
-					logger().Fatalf("Could not agree to tos -> %s", err)
-				}
-				acc.Save()
-				break
-			}
-
-			logger().Println("Your input was invalid. Please answer with one of Y/y, n or by pressing enter.")
-		}
+		handleTOS(c, client, acc)
 	}
 
 	if len(c.GlobalStringSlice("domains")) == 0 {