Added more protections in Users controller