user separated email logic fixed