Updated the servlet + web ui to properly handle the changes with users