Modifications in order to show correctly email and party