Bug Fix on Reset Email feature