added user retrieval by email and username