added email or username login
fixed and merge