Updating s_server to make the email part optional