Fixed creating and updating users