diff --git a/letsencrypt/client/client.py b/letsencrypt/client/client.py
index d9a8f657e..4bed62dc9 100755
--- a/letsencrypt/client/client.py
+++ b/letsencrypt/client/client.py
@@ -286,7 +286,6 @@ class Client(object):
             self.redirect = display.redirect_by_default()
 
         if self.redirect:
-            print "HERE"
             self.redirect_to_ssl(vhost)
             self.config.restart(quiet=self.curses)
 
@@ -520,12 +519,12 @@ class Client(object):
 
     def redirect_to_ssl(self, vhost):
         for ssl_vh in vhost:
-         success, redirect_vhost = self.config.enable_redirect(ssl_vh)
-         logger.info("\nRedirect vhost: " + redirect_vhost.file +
+            success, redirect_vhost = self.config.enable_redirect(ssl_vh)
+            logger.info("\nRedirect vhost: " + redirect_vhost.file +
                      " - " + str(success))
-         # If successful, make sure redirect site is enabled
-         if success:
-             self.config.enable_site(redirect_vhost)
+            # If successful, make sure redirect site is enabled
+            if success:
+                self.config.enable_site(redirect_vhost)
 
 
     def get_virtual_hosts(self, domains):
diff --git a/letsencrypt/client/display.py b/letsencrypt/client/display.py
index 6b47f159a..00d992ab0 100644
--- a/letsencrypt/client/display.py
+++ b/letsencrypt/client/display.py
@@ -309,11 +309,11 @@ def redirect_by_default():
                                   "Please enter the appropriate number",
                                   width = WIDTH)
 
-    if result[0] != 0:
+    if result[0] != OK:
         return False
 
     # different answer for each type of display
-    return (result[1] == "Secure" or result[1] == 1)
+    return (str(result[1]) == "Secure" or result[1] == 1)
 
 
 def confirm_revocation(cert):