Whyd: tightening input, use username if provided