merged cache buster and accepted current changes

src/app/UserWrapper.tsx

@@ -82,7 +82,20 @@ export default function UserWrapper(props: Props) {
         firmware: new Map()
       })
     }).catch(() => {
-      setGlobal(globalDefault)
+      userAPI.getUser(user_id).then(user => {
+        setGlobal({
+          user: user ? user : User.create(),
+          team: globalDefault.team,
+          as: "",
+          showErrors: false,
+          userTeamPermissions: [],
+          backgroundTasksComplete: false,
+          firmware: new Map()
+        })
+      }).catch(() => {
+        setGlobal(globalDefault)
+      })
+      
     })
     .finally(() => {
       setLoading(false)