Fix to prevent nil currentUser object, still needs populated with currentUser attributes