diff --git a/notifications_autosubscribe/notifications_autosubscribe.info b/notifications_autosubscribe/notifications_autosubscribe.info
new file mode 100644
index 0000000..d172a37
--- /dev/null
+++ b/notifications_autosubscribe/notifications_autosubscribe.info
@@ -0,0 +1,6 @@
+name = Notifications Autosubscribe
+description = Provides automatic notifications.
+package = "Notifications"
+dependencies[] = notifications 
+dependencies[] = notifications_content
+core = 7.x
diff --git a/notifications_autosubscribe/notifications_autosubscribe.module b/notifications_autosubscribe/notifications_autosubscribe.module
new file mode 100644
index 0000000..c937e5e
--- /dev/null
+++ b/notifications_autosubscribe/notifications_autosubscribe.module
@@ -0,0 +1,111 @@
+<?php
+/**
+ * @file
+ *   Notifications Autosubscribe module.
+ * 
+ * Allows users to automatically subscribe to threads they create or comment on. This module depends on
+ * and needs to run before notifications_content module (weight = 100) for it to work properly.
+ */
+
+/**
+ * Implementation of hook_node_insert()
+ */
+function notifications_autosubscribe_node_insert($node) {
+  global $user;
+  
+  if ($user->uid && $node->uid == $user->uid) {
+    notifications_autosubscribe($user, $node);
+  }
+}
+
+/**
+ * Implementation of hook_comment_insert().
+ */
+function notifications_autosubscribe_comment_insert($comment) {
+  global $user;
+  
+  // $comment can be an object or an array.
+  $comment = (object)$comment;
+
+  if (user_is_logged_in() && $comment->uid == $user->uid) {
+    notifications_autosubscribe($user, node_load($comment->nid)); 
+  }
+}
+
+/**
+ * Subscribes users to content they post, if not already subscribed
+ *
+ * @param $account
+ *   User account to subscribe
+ * @param $type
+ *   Subscription type
+ * @param $field
+ *   Object or key field
+ * @param $value
+ *   Int, value of $field that triggers subscription.
+ *
+ */
+function notifications_autosubscribe($account, $node) {
+  // if user has auto subscribe enabled
+  if (notifications_user_setting('auto', $account) && !notifications_get_subscriptions(array('type' => 'content_thread', 'uid' => $account->uid), array('node:nid' => $node->nid))) {
+    $subscription = Notifications_Subscription::build_type(content_thread);
+    $subscription->set_user($account);
+    $subscription->set_node($node);    
+    notifications_save_subscription($subscription);    
+  }
+}
+
+/**
+ * Implementation of hook_form_alter()
+ *
+ * Adds autosubscribe checkbox to user edit form.
+ */
+function notifications_autosubscribe_form_alter(&$form, $form_state, $form_id) {
+  switch ($form_id) {
+    case 'user_edit':
+    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']),
+          '#description'   => t('Checking this box allows you to automatically subscribe to any thread you create or post a comment to.'),
+        );
+      }
+      break;
+    case 'notifications_content_settings_form':
+      $form['autosubscribe'] = array('#type' => 'fieldset', '#title' => t('Autosubscribe'), '#weight' => -10);
+      $form['autosubscribe']['notifications_default_auto'] = array(
+        '#type'          => 'checkbox',
+        '#title'         => t('Set all users to "autosubscribe" by default'),
+        '#default_value' => variable_get('notifications_default_auto', 0),
+        '#description'   => t("If checked the option will be 'enabled' by default for user account settings. This won't change existing settings for users who have already defined it."),
+      );
+      break;
+  }
+}
+
+/**
+ * Implementation of hook_notifications_node_form_alter
+ * 
+ * Replace normal 'thread' subscription by autosubscribe option
+ */
+function notifications_autosubscribe_notifications_node_form_alter(&$form) {
+  //notifications_subscription_subscribe_form ??
+  global $user;
+
+  if (!empty($form['subscriptions']['params']) && notifications_user_setting('auto', $form['subscriptions']['account']['#value'])) {
+    foreach ($form['subscriptions']['params']['#value'] as $index => $current) {
+      if ($current['type'] == 'content_thread' && empty($current->sid)) {
+        $form['subscriptions']['autosubscribe'] = array(
+          '#type' => 'checkbox',
+          '#default_value' => 1,
+          '#disabled' => TRUE,
+          '#title' => $form['subscriptions']['options']['#options'][$index],
+          '#description' => t('You are currently set to receive notifications for replies to content which you create. To change this default, uncheck the autosubscribe option in your user account settings.'),
+        );
+        unset($form['subscriptions']['options']['#options'][$index]);
+      }
+    }
+  }
+}