Fixed user edit and user add