Revert "user_key needs to be email"

This reverts commit f5d5cc265bf8b9fc5abbb7e61182dafa8fb0cedb.
Fix tests to work with split username/email setup