cleanup, user mail save fix