added resolve currentUser