diff --git a/raven.admin.inc b/raven.admin.inc
index 49a3fa3..80a6afd 100644
--- a/raven.admin.inc
+++ b/raven.admin.inc
@@ -115,6 +115,13 @@ function raven_settings_form(array &$form, array &$form_state) {
     '#default_value' => variable_get('raven_trace', FALSE),
   );
 
+  $form['raven']['php']['raven_send_user_data'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Send user data to Sentry'),
+    '#description' => t('Check to send user email and username to Sentry with each event. Warning: User data can still be sent to Sentry even when this setting is disabled, for example as part of a log message or request body. Custom code is required to scrub personally-identifying information from events before they are sent.'),
+    '#default_value' => variable_get('raven_send_user_data', FALSE),
+  );
+
   $form['raven']['php']['raven_rate_limit'] = array(
     '#type' => 'textfield',
     '#title' => t('Rate limit'),
diff --git a/raven.module b/raven.module
index 1487f3f..9f587eb 100644
--- a/raven.module
+++ b/raven.module
@@ -57,7 +57,7 @@ function raven_init() {
     $context['id'] = $user->uid;
     $context['ip_address'] = ip_address();
     $context['roles'] = implode(', ', $user->roles);
-    if (user_is_logged_in()) {
+    if (user_is_logged_in() && variable_get('raven_send_user_data', FALSE)) {
       $context['username'] = $user->name;
       $context['email'] = $user->mail;
     }
@@ -180,8 +180,10 @@ function raven_watchdog($log_entry) {
   $user = UserDataBag::createFromUserIdentifier($log_entry['uid']);
   $user->setIpAddress($log_entry['ip']);
   if ($log_entry['user'] && $log_entry['uid']) {
-    $user->setEmail($log_entry['user']->mail);
-    $user->setUsername($log_entry['user']->name);
+    if (variable_get('raven_send_user_data', FALSE)) {
+      $user->setEmail($log_entry['user']->mail);
+      $user->setUsername($log_entry['user']->name);
+    }
     $user->setMetadata('roles', implode(', ', $log_entry['user']->roles));
   }
   $event->setUser($user);