diff --git a/enrol/authorize/enrol.php b/enrol/authorize/enrol.php
index d7986156f55..a3a6a8b63a3 100755
--- a/enrol/authorize/enrol.php
+++ b/enrol/authorize/enrol.php
@@ -132,7 +132,7 @@ class enrolment_plugin_authorize
     {
         global $CFG;
 
-        if (zero_cost($course) || (!empty($course->password) && !empty($form->password))) {
+        if (zero_cost($course) || (!empty($course->password) && !empty($form->password) && $form->enrol == 'manual')) {
             $manual = enrolment_factory::factory('manual');
             $manual->check_entry($form, $course);
             if (!empty($manual->errormsg)) {
diff --git a/enrol/manual/enrol.html b/enrol/manual/enrol.html
index b2f34aad2df..c3f563d45cb 100644
--- a/enrol/manual/enrol.html
+++ b/enrol/manual/enrol.html
@@ -20,6 +20,7 @@
             <td>
               <input type="password" name="password" size="20" value="<?php p($password) ?>"  />
               <input type="hidden" name="id" value="<?php p($course->id) ?>"  />
+              <input type="hidden" name="enrol" value="manual" />
               <input type="submit" value="<?php print_string("enrolme") ?>" />
             </td>
           </tr>