diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 9885ad9cf21..5d4a43f6445 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -217,6 +217,7 @@ $string['currentcourseadding'] = 'Current course, adding data to it';
 $string['currentcoursedeleting'] = 'Current course, deleting it first';
 $string['currentlanguage'] = 'Current language';
 $string['currentlocaltime'] = 'your current local time';
+$string['currentpicture'] = 'Current picture';
 $string['currentrelease'] = 'Current release information';
 $string['currentversion'] = 'Current version';
 $string['databasechecking'] = 'Upgrading Moodle database from version $a->oldversion to $a->newversion...';
diff --git a/user/edit.html b/user/edit.html
index 7c7ee543d8c..8da7f1360c7 100644
--- a/user/edit.html
+++ b/user/edit.html
@@ -174,9 +174,7 @@ if (isadmin()) {
     </td>
 </tr>
 <tr>
-    <td colspan=2><br /><b><?php print_string("followingoptional") ?>:</b>&nbsp;&nbsp;&nbsp;
-       <?php print_user_picture($user->id, $course->id, $user->picture, false, false, false); ?>
-    </td>
+    <td colspan=2><br /><b><?php print_string("followingoptional") ?>:</b></td>
 </tr>
 
 
@@ -184,6 +182,17 @@ if (isadmin()) {
     $maxbytes = get_max_upload_file_size($CFG->maxbytes, $course->maxbytes);
     if (!empty($CFG->gdversion) and $maxbytes and empty($CFG->disableuserimages)) {  
 ?>
+<tr valign=top>
+    <td><p><?php print_string("currentpicture") ?>:</td>
+    <td>
+       <?php print_user_picture($user->id, $course->id, $user->picture, false, false, false); 
+             if ($user->picture) {
+                 echo '&nbsp;&nbsp;<input type="checkbox" name="deletepicture" value="1">';
+                 print_string("delete");
+             }
+       ?>
+    </td>
+</tr>
 <tr valign=top>
     <td><p><?php print_string("newpicture") ?>:</td>
     <td>
diff --git a/user/edit.php b/user/edit.php
index 49e42ed75db..3bbf1691b3b 100644
--- a/user/edit.php
+++ b/user/edit.php
@@ -70,6 +70,11 @@
             if ($filename = valid_uploaded_file($_FILES['imagefile'])) { 
                 $usernew->picture = save_profile_image($user->id, $filename);
                 set_field('user', 'picture', $usernew->picture, 'id', $user->id);  /// Note picture in DB
+            } else {
+                if (!empty($usernew->deletepicture)) {
+                    set_field('user', 'picture', 0, 'id', $user->id);  /// Delete picture
+                    $usernew->picture = 0;
+                }
             }
 
             $user = $usernew;
@@ -80,7 +85,12 @@
             if ($filename = valid_uploaded_file($_FILES['imagefile'])) { 
                 $usernew->picture = save_profile_image($user->id, $filename);
             } else {
-                $usernew->picture = $user->picture;
+                if (!empty($usernew->deletepicture)) {
+                    set_field('user', 'picture', 0, 'id', $user->id);  /// Delete picture
+                    $usernew->picture = 0;
+                } else {
+                    $usernew->picture = $user->picture;
+                }
             }
     
             $usernew->timemodified = time();