Only set username if available