Fixed email to username conversion