cahnges on user management handeling