Fixing up nuid to match actual number not email, and updating user_key