mail moved into users controller