diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index e4062fe1cd6..e75cbdb17c1 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -3814,6 +3814,12 @@ function delete_user($user) {
     // last course access not necessary either
     $DB->delete_records('user_lastaccess', array('userid'=>$user->id));
 
+    // remove all user tokens
+    $DB->delete_records('external_tokens', array('userid'=>$user->id));
+
+    // unauthorise the user for all services
+    $DB->delete_records('external_services_users', array('userid'=>$user->id));
+
     // force logout - may fail if file based sessions used, sorry
     session_kill_user($user->id);