diff --git a/captcha.inc b/captcha.inc
index 6af73a6..35e7dba 100644
--- a/captcha.inc
+++ b/captcha.inc
@@ -330,8 +330,10 @@ function _captcha_search_buttons($form) {
  *       If 'key' is NULL and weight is not NULL: set the weight property of the CAPTCHA element
  *       to this value.
  * @param $captcha_element the CAPTCHA element to insert.
+ * @param $captcha_element_name the key to use when inserting the element into $form.
+ *    Defaults to 'captcha'.
  */
-function _captcha_insert_captcha_element(&$form, $placement, $captcha_element) {
+function _captcha_insert_captcha_element(&$form, $placement, $captcha_element, $captcha_elem_name = 'captcha') {
   // Get path, target and target weight or use defaults if not available.
   $target_key = isset($placement['key']) ? $placement['key'] : NULL;
   $target_weight = isset($placement['weight']) ? $placement['weight'] : NULL;
@@ -357,7 +359,7 @@ function _captcha_insert_captcha_element(&$form, $placement, $captcha_element) {
     if ($target_weight != NULL) {
       $captcha_element['#weight'] = $target_weight;
     }
-    $form_stepper['captcha'] =  $captcha_element;
+    $form_stepper[$captcha_elem_name] =  $captcha_element;
   }
   // If there is a target available: make sure the CAPTCHA element comes right before it.
   else {
@@ -365,7 +367,7 @@ function _captcha_insert_captcha_element(&$form, $placement, $captcha_element) {
     // and just append the CAPTCHA: sorting will fix the ordering anyway.
     if ($target_weight != NULL) {
       $captcha_element['#weight'] = $target_weight - .1;
-      $form_stepper['captcha'] =  $captcha_element;
+      $form_stepper[$captcha_elem_name] =  $captcha_element;
     }
     else {
       // If we can't play with weights: insert the CAPTCHA element at the right position.
@@ -374,7 +376,7 @@ function _captcha_insert_captcha_element(&$form, $placement, $captcha_element) {
       // chop of the end, append the CAPTCHA element and put the end back.
       $offset = array_search($target_key, array_keys($form_stepper));
       $end = array_splice($form_stepper, $offset);
-      $form_stepper['captcha'] =  $captcha_element;
+      $form_stepper[$captcha_elem_name] =  $captcha_element;
       foreach ($end as $k => $v) {
         $form_stepper[$k] = $v;
       }
diff --git a/captcha.module b/captcha.module
index 5107452..e3283cf 100644
--- a/captcha.module
+++ b/captcha.module
@@ -346,7 +346,8 @@ function captcha_form_alter(&$form, &$form_state, $form_id) {
       _captcha_insert_captcha_element($form, $captcha_placement, $captcha_element);
     }
   }
-  else if (
+
+  if (
   variable_get('captcha_administration_mode', FALSE)
   && user_access('administer CAPTCHA settings')
   && (arg(0) != 'admin' || variable_get('captcha_allow_on_admin_pages', FALSE))
@@ -408,7 +409,7 @@ function captcha_form_alter(&$form, &$form_state, $form_id) {
     }
     // Get placement in form and insert in form.
     $captcha_placement = _captcha_get_captcha_placement($form_id, $form);
-    _captcha_insert_captcha_element($form, $captcha_placement, $captcha_element);
+    _captcha_insert_captcha_element($form, $captcha_placement, $captcha_element, 'captcha_admin');
 
   }