revised username handling. email2 is now the dummy field