diff --git a/index.php b/index.php
index 1df4cc6..ec70b9f 100755
--- a/index.php
+++ b/index.php
@@ -110,7 +110,7 @@
     $error .= validate_password($password);
 
 
-    if (!(isset($_SESSION['captcha']) && PhraseBuilder::comparePhrases($_SESSION['captcha'], $_POST['captcha']))) {
+    if ($CAPTCHA_LENGTH > 0  &&  !(isset($_SESSION['captcha']) && PhraseBuilder::comparePhrases($_SESSION['captcha'], $_POST['captcha']))) {
         $error = $error . $STRINGS->wrong_captcha;
     }
     unset($_SESSION["captcha"]);
@@ -193,7 +193,7 @@
                     $error = $error . $STRINGS->recover_email_not_registered;
                 }
 
-                if (!(isset($_SESSION['captcha']) && PhraseBuilder::comparePhrases($_SESSION['captcha'], $_POST['captcha']))) {
+                if ($CAPTCHA_LENGTH > 0 && !(isset($_SESSION['captcha']) && PhraseBuilder::comparePhrases($_SESSION['captcha'], $_POST['captcha']))) {
                     $error = $error . $STRINGS->wrong_captcha;
                 }