Add login and cleanup.