Add alerts and implement user lock