Update user add and edit to work with new user_settings table