Yes, I reworked this so if they fill in both, it will always lookup by Username first.