Mails and redirection fix