diff --git a/r2/r2/controllers/validator/validator.py b/r2/r2/controllers/validator/validator.py
index 383a0e9a6..47d84ef92 100644
--- a/r2/r2/controllers/validator/validator.py
+++ b/r2/r2/controllers/validator/validator.py
@@ -585,7 +585,7 @@ class VCaptcha(Validator):
     default_param = ('iden', 'captcha')
     
     def run(self, iden, solution):
-        if (not c.user_is_loggedin or c.user.needs_captcha()):
+        if c.user.needs_captcha():
             valid_captcha = captcha.valid_solution(iden, solution)
             if not valid_captcha:
                 self.set_error(errors.BAD_CAPTCHA)
diff --git a/r2/r2/models/account.py b/r2/r2/models/account.py
index ba61526db..2565b9ab0 100644
--- a/r2/r2/models/account.py
+++ b/r2/r2/models/account.py
@@ -213,7 +213,7 @@ class Account(Thing):
         return id_time + ',' + sha.new(to_hash).hexdigest()
 
     def needs_captcha(self):
-        return self.link_karma < 1 and not g.disable_captcha
+        return not g.disable_captcha and self.link_karma < 1
 
     def modhash(self, rand=None, test=False):
         return modhash(self, rand = rand, test = test)