diff --git a/includes/notification.inc b/includes/notification.inc
index 4f0f004..2e4d263 100644
--- a/includes/notification.inc
+++ b/includes/notification.inc
@@ -12,7 +12,7 @@
  */
 function _project_issue_notification_levels() {
   $levels = array(
-    PROJECT_ISSUE_NOTIFICATION_NONE => t('None'),
+    PROJECT_ISSUE_NOTIFICATION_NONE => t('No e-mail'),
     PROJECT_ISSUE_NOTIFICATION_OWN => t('Own issues'),
     PROJECT_ISSUE_NOTIFICATION_ALL => t('All issues'),
   );
@@ -251,15 +251,24 @@ function project_issue_notification_project_form($form_state, $project) {
     '#value' => $user->uid,
   );
 
+  $account_url = url('user/' . $user->uid . '/project-issue');
+
+  $options = _project_issue_notification_levels();
+
+  project_issue_notification_user_settings_load($user);
+  $default_option = t('Use site-wide default (currently <a href="@account-url">@default</a>)', array('@account-url' => $account_url, '@default' => $options[$user->project_issue_notification['level']]));
+
+  $options = array(PROJECT_ISSUE_NOTIFICATION_UNDEFINED => $default_option) + $options;
+
   $level = project_issue_notification_project_setting_load($user->uid, $project->nid);
   $form['level'] = array(
     '#type' => 'radios',
     '#title' => t('Send e-mail'),
-    '#options' => _project_issue_notification_levels(),
+    '#options' => $options,
     '#default_value' => $level,
     '#description' => t('These settings only apply to the %project project. Manage notifications for all projects in your <a href="@account-url">user account</a>.', array(
       '%project' => $project->title,
-      '@account-url' => url('user/' . $user->uid . '/project-issue'),
+      '@account-url' => $account_url,
     )),
   );
 
@@ -274,8 +283,12 @@ function project_issue_notification_project_form($form_state, $project) {
  * Form submission handler for project_issue_project_notification_form().
  */
 function project_issue_notification_project_form_submit($form, &$form_state) {
-  project_issue_notification_project_setting_save($form_state['values']['uid'], $form_state['values']['nid'], $form_state['values']['level']);
-
+  if ($form_state['values']['level'] == PROJECT_ISSUE_NOTIFICATION_UNDEFINED) {
+    project_issue_notification_project_setting_delete($form_state['values']['uid'], $form_state['values']['nid']);
+  }
+  else {
+    project_issue_notification_project_setting_save($form_state['values']['uid'], $form_state['values']['nid'], $form_state['values']['level']);
+  }
   drupal_set_message(t('Your notification settings have been updated.'));
 }
 
diff --git a/project_issue.module b/project_issue.module
index b0e709a..d97d7e2 100644
--- a/project_issue.module
+++ b/project_issue.module
@@ -11,6 +11,11 @@ define('PROJECT_ISSUE_STATE_FIXED', 2);
 define('PROJECT_ISSUE_STATE_CLOSED', 7);
 
 /**
+ * Project issue notification level: No notification level defined.
+ */
+define('PROJECT_ISSUE_NOTIFICATION_UNDEFINED', -1);
+
+/**
  * Project issue notification level: No notification emails.
  */
 define('PROJECT_ISSUE_NOTIFICATION_NONE', 0);
@@ -1032,6 +1037,7 @@ function project_issue_notification_user_settings_save($account) {
  *
  * @return
  *   An integer denoting the user's project issue notification level:
+ *   - PROJECT_ISSUE_NOTIFICATION_UNDEFINED
  *   - PROJECT_ISSUE_NOTIFICATION_NONE
  *   - PROJECT_ISSUE_NOTIFICATION_OWN
  *   - PROJECT_ISSUE_NOTIFICATION_ALL
@@ -1039,11 +1045,8 @@ function project_issue_notification_user_settings_save($account) {
  * @see project_issue_notification_project_setting_save()
  */
 function project_issue_notification_project_setting_load($uid, $nid) {
-  $level = db_result(db_query("SELECT level FROM {project_issue_notification_project} WHERE uid = %d AND nid = %d", array(
-    $uid,
-    $nid,
-  )));
-  return ($level !== FALSE ? $level : PROJECT_ISSUE_NOTIFICATION_NONE);
+  $level = db_result(db_query("SELECT level FROM {project_issue_notification_project} WHERE uid = %d AND nid = %d", array($uid, $nid)));
+  return ($level !== FALSE ? $level : PROJECT_ISSUE_NOTIFICATION_UNDEFINED);
 }
 
 /**