Added confirmation email check to change_email method
Issue 3019: resolving merge conflict