Ensure UUID is never null at login. Amends #214 and fixes #229