Fix bugs in Users. For deployment Final