[#4] Replaced username with email field

@zzgvh Can you take a look and merge? Needed for the switch to email as a username. We refer to the previous commit in the requirements, so nothing will change in the live situation..