Made currentUser more robust