Better handling of missing user scenario