Fix listing display, show email or username when signed in