Fix incorrect handling of admin_email and actual admin user's email when original admin_email user was deleted - #603
Merged
admin_email and actual admin user's email when original admin_email user was deleted - #603