fixes on display logic for current_user