Update: make Password flow work with uuids