Fix: Replace email with username