Fix issue with saving / updating users