diff --git a/assets/snippets/weblogin/weblogin.processor.inc.php b/assets/snippets/weblogin/weblogin.processor.inc.php
old mode 100755
new mode 100644
index 6e773c477b..643620b633
--- a/assets/snippets/weblogin/weblogin.processor.inc.php
+++ b/assets/snippets/weblogin/weblogin.processor.inc.php
@@ -303,7 +303,7 @@
         }
     }
 
-    if(isset($modx->config['use_captcha']) && $modx->config['use_captcha']==1) {
+    if(isset($modx->config['use_captcha']) && $modx->config['use_captcha']==1 && isset($_POST['cmdwebsignup'])) {
         if($_SESSION['veriword']!=$captcha_code) {
             $output = webLoginAlert("The security code you entered didn't validate! Please try to login again!");
             $newloginerror = 1;
diff --git a/install/assets/snippets/websignup.tpl b/install/assets/snippets/websignup.tpl
old mode 100755
new mode 100644
index 14c6fa28fe..7f339aba58
--- a/install/assets/snippets/websignup.tpl
+++ b/install/assets/snippets/websignup.tpl
@@ -23,11 +23,16 @@
 # Params:    
 #
 #    &tpl        - (Optional) Chunk name or document id to use as a template
+#                  If custom template AND captcha on AND using WebSignup and 
+#                  WebLogin on the same page make sure you have a field named
+#                  cmdwebsignup. In the default template it is the submit button 
+#                  One can use a hidden field.
 #    &groups     - Web users groups to be assigned to users
 #    &useCaptcha - (Optional) Determine to use (1) or not to use (0) captcha
 #                  on signup form - if not defined, will default to system
 #                  setting. GD is required for this feature. If GD is not 
 #                  available, useCaptcha will automatically be set to false;
+#
 #                  
 #    Note: Templats design:
 #        section 1: signup template