Merge "User: Fix loading of user_token"