diff --git a/nocurrent_pass.module b/nocurrent_pass.module
index 9c2c2ea..27f8eb8 100644
--- a/nocurrent_pass.module
+++ b/nocurrent_pass.module
@@ -22,18 +22,24 @@ function nocurrent_pass_form_user_admin_settings_alter(&$form, &$form_state) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
- * Remove the current password field from the user_profile_form form (user/%/edit).
+ * Implements hook_form_alter().
+ * Remove the current password field
  */
-function nocurrent_pass_form_user_profile_form_alter(&$form, &$form_state) {
-  if (variable_get('nocurrent_pass_disabled', TRUE)) {
-    // searches the #validate array for the current_pass validation function, and removes it
-    $key = array_search('user_validate_current_pass', $form['#validate']);
-    if ($key !== FALSE) {
-      unset($form['#validate'][$key]);
-    }
-    // hide the current password fields
-    $form['account']['current_pass_required_value']['#access'] = FALSE;
-    $form['account']['current_pass']['#access'] = FALSE;
-  }
+function nocurrent_pass_form_alter(&$form, &$form_state, $form_id){
+	
+	if(isset($form['account']['current_pass'])){
+		
+	  if (variable_get('nocurrent_pass_disabled', TRUE)) {
+		// searches the #validate array for the current_pass validation function, and removes it
+		$key = array_search('user_validate_current_pass', $form['#validate']);
+		if ($key !== FALSE) {
+		  unset($form['#validate'][$key]);
+		}
+		// hide the current password fields
+		$form['account']['current_pass_required_value']['#access'] = FALSE;
+		$form['account']['current_pass']['#access'] = FALSE;
+	  }
+  
+	}
+	
 }
\ No newline at end of file