Logged_in handling refactoring, default note applied