diff --git a/modules/user.module b/modules/user.module
index 3e562a8630edda65271e61e338a65cf49ef8b078..2fc62298faa395709d854917c9117c7ca4232afb 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -1241,7 +1241,9 @@ function _user_edit_submit($uid, &$edit) {
     }
     $edit['picture'] = '';
   }
-  $edit['roles'] = array_filter($edit['roles']);
+  if (isset($edit['roles'])) {
+    $edit['roles'] = array_filter($edit['roles']);
+  }
 }
 
 function user_edit($category = 'account') {
diff --git a/modules/user/user.module b/modules/user/user.module
index 3e562a8630edda65271e61e338a65cf49ef8b078..2fc62298faa395709d854917c9117c7ca4232afb 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1241,7 +1241,9 @@ function _user_edit_submit($uid, &$edit) {
     }
     $edit['picture'] = '';
   }
-  $edit['roles'] = array_filter($edit['roles']);
+  if (isset($edit['roles'])) {
+    $edit['roles'] = array_filter($edit['roles']);
+  }
 }
 
 function user_edit($category = 'account') {