Fixed non-handled currentUser states