Followup to fix regression on #327: Use username after all