Added password field to user management, and fixed an error condition