Removed dead code, swapped around order of field entry so email is not last