diff --git a/notifications/notifications_autosubscribe/.notifications_autosubscribe.module.swp b/notifications/notifications_autosubscribe/.notifications_autosubscribe.module.swp
index 445e78d..90ffd20 100644
Binary files a/notifications/notifications_autosubscribe/.notifications_autosubscribe.module.swp and b/notifications/notifications_autosubscribe/.notifications_autosubscribe.module.swp differ
diff --git a/notifications/notifications_autosubscribe/notifications_autosubscribe.module b/notifications/notifications_autosubscribe/notifications_autosubscribe.module
index c7733ec..6d8c5a5 100644
--- a/notifications/notifications_autosubscribe/notifications_autosubscribe.module
+++ b/notifications/notifications_autosubscribe/notifications_autosubscribe.module
@@ -37,11 +37,11 @@ function notifications_autosubscribe($type, $event_type, $field, $value) {
  *
  * Adds autosubscribe checkbox to user edit form.
  */
-function notifications_autosubscribe_form_alter($form_id, &$form) {
+function notifications_autosubscribe_form_alter(&$form, &$form_sate, $form_id) {
   switch ($form_id) {
-    case 'user_edit':
-      if (isset($form['notifications'])) {
-        $form['notifications']['notifications_auto'] = array(
+    case 'user_profile_form':
+      if (isset($form['messaging'])) {
+        $form['messaging']['notifications_auto'] = array(
           '#type'          => 'checkbox',
           '#title'         => t('Autosubscribe'),
           '#default_value' => notifications_user_setting('auto', $form['_account']['#value']),
@@ -78,7 +78,7 @@ function notifications_autosubscribe_notifications($op, $arg0, $arg1 = NULL, $ar
  * 
  * Replace normal 'thread' subscription by autosubscribe option
  */
-function notifications_autosubscribe_notifications_node_form_alter(&$form) {
+function notifications_autosubscribe_notifications_node_form_alter(&$form, &$form_state) {
   global $user;
 
   if (!empty($form['subscriptions']['params']) && notifications_user_setting('auto', $form['subscriptions']['account']['#value'])) {