Use get_username instead of assuming username field