diff --git a/frontend/react/src/olympusapp.ts b/frontend/react/src/olympusapp.ts
index fd9b3a1f..8f6f545e 100644
--- a/frontend/react/src/olympusapp.ts
+++ b/frontend/react/src/olympusapp.ts
@@ -2,8 +2,10 @@
 var app: OlympusApp;
 
 export function setupApp() {
-    app = new OlympusApp();
-    app.start();    
+    if (app === undefined) {
+        app = new OlympusApp();
+        app.start();    
+    }
 }
 
 export function getApp() {
@@ -477,7 +479,7 @@ export class OlympusApp {
         }
 
         /* Temporary */
-        this.getServerManager().setCredentials("admin", "6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b");
+        this.getServerManager().setCredentials("admin", "4b8823ed9e5c2392ab4a791913bb8ce41956ea32e308b760eefb97536746dd33");
         this.getServerManager().startUpdate();
 
         /* Reload the page, used to mimic a restart of the app */
diff --git a/frontend/react/src/ui/ui.tsx b/frontend/react/src/ui/ui.tsx
index f920a21c..23e42d3c 100644
--- a/frontend/react/src/ui/ui.tsx
+++ b/frontend/react/src/ui/ui.tsx
@@ -49,7 +49,7 @@ export function UI() {
 	}
 
 	return (
-		<div className="absolute top-0 left-0 h-screen w-screen font-sans overflow-hidden">
+		<div className="absolute top-0 left-0 h-screen w-screen font-sans overflow-hidden" onLoad={setupApp}>
 			<StateProvider value={{
 				mainMenuVisible: mainMenuVisible,
 				spawnMenuVisible: spawnMenuVisible,
@@ -73,7 +73,7 @@ export function UI() {
 						toggleDrawingMenuVisible: () => { hideAllMenus(); setDrawingMenuVisible(!drawingMenuVisible) },
 					}
 				}>
-					<div className='absolute top-0 left-0 h-full w-full flex flex-col' onLoad={setupApp}>
+					<div className='absolute top-0 left-0 h-full w-full flex flex-col'>
 						<Header />
 						<div className='flex h-full'>
 							<SideBar />