diff --git a/pages/settings.tsx b/pages/settings.tsx
index 927c315..5b836a6 100644
--- a/pages/settings.tsx
+++ b/pages/settings.tsx
@@ -32,9 +32,9 @@ const Settings: NextPage = () => {
 
   useEffect(() => {
     getUserInfoExtended((res) => {
-      setUser(res['data']['userInfo']);
+      setUser(res);
       if (res) {
-        if (res['data']?.["userInfo"]?.organizationId) {
+        if (res?.organizationId) {
           if (WebSocketsService.getConnectionOpened()) return;
           WebSocketsService.setConnectionOpened(true);
           WebSocketsService.initWsNotifications();
@@ -54,7 +54,7 @@ const Settings: NextPage = () => {
   }, []);
 
   function refetchAdminMessagesAndProcess() {
-    getAllActiveAdminMessages((res) => setActiveAdminMessages(postProcessAdminMessages(res["data"]["allActiveAdminMessages"])));
+    getAllActiveAdminMessages((res) => setActiveAdminMessages(postProcessAdminMessages(res)));
   }
 
   useWebsocket(user?.organizationId, Application.ENTRY, CurrentPage.ENTRY_LAYOUT, handleWebsocketNotification)
diff --git a/submodules/javascript-functions b/submodules/javascript-functions
index 3bd200a..12bf29c 160000
--- a/submodules/javascript-functions
+++ b/submodules/javascript-functions
@@ -1 +1 @@
-Subproject commit 3bd200a34cc3531519d0b3e48fca5910a10b19e3
+Subproject commit 12bf29c1966fe1bfeb716d4e6f4dc9112e7c1ee4
diff --git a/submodules/react-components b/submodules/react-components
index a90abdd..7f969a7 160000
--- a/submodules/react-components
+++ b/submodules/react-components
@@ -1 +1 @@
-Subproject commit a90abdd0061491a2f17e089b441aade2afc4465d
+Subproject commit 7f969a7bf3d279ed656380a0b69b8a7d7f0adf09