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