added email & username login