Fix #1161

Avatars and photos are deleted with the user no matter what. There is no option asking and is not based on the delete PFS option with these changes. I didn't think an option was needed since it is an independent plugin and seemed reasonable.