UPDATED USER MANAGEMENT