diff --git a/backend/src/controllers/DashboardBackendController.ts b/backend/src/controllers/DashboardBackendController.ts
index 472c391..9992eb4 100644
--- a/backend/src/controllers/DashboardBackendController.ts
+++ b/backend/src/controllers/DashboardBackendController.ts
@@ -19,7 +19,8 @@ import {
     DASHBOARD_API_UPDATE_MY_WORKSPACE_USER_WORKSPACE_ID,
     DASHBOARD_API_UPDATE_MY_WORKSPACE_USER_PATH,
     DASHBOARD_API_UPDATE_MY_WORKSPACE_USER_USER_ID,
-    VALID_ADMIN_DOMAINS
+    VALID_ADMIN_DOMAINS,
+    DASHBOARD_API_GET_MY_WORKSPACE_USER_BY_PROFILE_PATH
 } from "../fi/hg/dashboard/constants/dashboard-api";
 
 import {
@@ -161,6 +162,64 @@ export class DashboardBackendController {
         }
     }
 
+    // *********** WORSKPACE USER PROFILE ***********
+
+    /**
+     * Returns profile for a workspace
+     *
+     * @param token
+     * @param parentIdString
+     */
+    @GetMapping(DASHBOARD_API_GET_MY_WORKSPACE_USER_BY_PROFILE_PATH)
+    public static async getMyWorkspaceUserByProfile(
+        @RequestHeader(DASHBOARD_AUTHORIZATION_HEADER_NAME, {
+            required: true
+        })
+            token: string,
+        @PathVariable(DASHBOARD_API_GET_MY_WORKSPACE_USER_LIST_WORKSPACE_ID, {required: true})
+            parentIdString: string
+    ): Promise<User | ResponseEntity<ErrorDTO>> {
+        try {
+
+            if ( !token ) {
+                LOG.warn(`Warning! No authentication token provided.`);
+                return ResponseEntity.internalServerError<ErrorDTO>().body(
+                    createErrorDTO('Access denied', 403)
+                );
+            }
+
+            const workspaceId: string = trim(parentIdString ?? '');
+            LOG.debug(`getMyWorkspaceUserList: workspaceId: `, workspaceId);
+
+            const email: string | undefined = JwtService.decodePayloadSubject(token);
+            if ( !email ) {
+                LOG.warn(`Warning! Token did not have an email address.`, token);
+                return ResponseEntity.internalServerError<ErrorDTO>().body(
+                    createErrorDTO('Access denied', 403)
+                );
+            }
+
+            if ( !this._emailTokenService.verifyToken(email, token, true) ) {
+                LOG.debug(`getMyWorkspaceUserList: Access denied for email: `, email, token);
+                return ResponseEntity.internalServerError<ErrorDTO>().body(
+                    createErrorDTO('Access denied', 403)
+                );
+            }
+
+            const userList: User[] = await this._backend.getUserListForWorkspace(workspaceId);
+
+            const profiles: User[] = userList.filter(user => user.email === email);
+
+            return profiles[0];
+
+        } catch (err) {
+            LOG.error(`getMyWorkspaceUserList: ERROR: `, err);
+            return ResponseEntity.internalServerError<ErrorDTO>().body(
+                createErrorDTO('Internal Server Error', 500)
+            );
+        }
+    }
+
 
     // *********** WORKSPACES ***********
 
diff --git a/backend/src/fi/hg/core b/backend/src/fi/hg/core
index 97c6792..9eec067 160000
--- a/backend/src/fi/hg/core
+++ b/backend/src/fi/hg/core
@@ -1 +1 @@
-Subproject commit 97c67921ae5ded832d9f19a5cc86e1f88a1f0062
+Subproject commit 9eec0676d58a1257f7b0cd038475bd3bbec58c95
diff --git a/backend/src/fi/hg/dashboard b/backend/src/fi/hg/dashboard
index f22aab8..6c60546 160000
--- a/backend/src/fi/hg/dashboard
+++ b/backend/src/fi/hg/dashboard
@@ -1 +1 @@
-Subproject commit f22aab8506668099848ad835213c491892b84914
+Subproject commit 6c60546d7905b01f5edc8f7290b261aaae6c2443
diff --git a/backend/src/fi/hg/node b/backend/src/fi/hg/node
index dadc59d..d970484 160000
--- a/backend/src/fi/hg/node
+++ b/backend/src/fi/hg/node
@@ -1 +1 @@
-Subproject commit dadc59d065a6a4705d98f310b3e54148f021c6ca
+Subproject commit d97048435a77587f69c22661101892aacda35e38
diff --git a/frontend/src/components/common/layout/appMenu/AppMenu.tsx b/frontend/src/components/common/layout/appMenu/AppMenu.tsx
index 2b80957..038fcac 100644
--- a/frontend/src/components/common/layout/appMenu/AppMenu.tsx
+++ b/frontend/src/components/common/layout/appMenu/AppMenu.tsx
@@ -2,9 +2,6 @@
 
 import { APP_MENU_CLASS_NAME } from "../../../../constants/appClassName";
 import { NavLink } from "react-router-dom";
-import {
-    USER_LIST_ROUTE
-} from "../../../../constants/route";
 import {
     T_APP_HEADER_NAV_USERS
 } from "../../../../constants/translation";
@@ -12,6 +9,9 @@ import { useCallback, MouseEvent } from "react";
 import { useEmailAuthSession } from "../../../../fi/hg/frontend/hooks/useEmailAuthSession";
 import { SetProfileMenuOpenCallback } from "../../../../fi/hg/frontend/hooks/useDropdownToggleWithoutWindowSizeAndScroll";
 import { TranslationFunction } from "../../../../fi/hg/core/types/TranslationFunction";
+import {useCurrentWorkspaceId} from "../../../../hooks/workspace/useCurrentWorkspaceId";
+import {LogService} from "../../../../fi/hg/core/LogService";
+import {getWorkspaceUserListRoute, MY_WORKSPACE_LIST_ROUTE} from "../../../../constants/route";
 import "./AppMenu.scss";
 
 export interface MenuProps {
@@ -19,7 +19,7 @@ export interface MenuProps {
     readonly className?: string;
     readonly changeMenuState: SetProfileMenuOpenCallback;
 }
-
+const LOG = LogService.createLogger('AppMenu');
 export function AppMenu (props: MenuProps) {
 
     const t = props?.t;
@@ -27,6 +27,9 @@ export function AppMenu (props: MenuProps) {
     const setMenuOpen = props.changeMenuState;
     const session = useEmailAuthSession();
 
+    const workspaceId = useCurrentWorkspaceId();
+    const workspaceUserListRoute = workspaceId ? getWorkspaceUserListRoute(workspaceId): MY_WORKSPACE_LIST_ROUTE;
+
     const closeMenuCallback = useCallback(
         (event: MouseEvent<HTMLDivElement>) => {
             if ( event ) {
@@ -66,7 +69,7 @@ export function AppMenu (props: MenuProps) {
 
                             <NavLink
                                 className={`${APP_MENU_CLASS_NAME}-content-nav-item`}
-                                to={USER_LIST_ROUTE}
+                                 to={workspaceUserListRoute}
                             >{t(T_APP_HEADER_NAV_USERS)}</NavLink>
 
                         </nav>
diff --git a/frontend/src/components/common/layout/appNav/AppNav.tsx b/frontend/src/components/common/layout/appNav/AppNav.tsx
index 9eb47cf..18a1633 100644
--- a/frontend/src/components/common/layout/appNav/AppNav.tsx
+++ b/frontend/src/components/common/layout/appNav/AppNav.tsx
@@ -3,11 +3,12 @@
 import { APP_NAV_CLASS_NAME } from "../../../../constants/appClassName";
 import { TranslationFunction } from "../../../../fi/hg/core/types/TranslationFunction";
 import { NavLink } from "react-router-dom";
-import { ABOUT_ROUTE, USER_LIST_ROUTE } from "../../../../constants/route";
+import {ABOUT_ROUTE, getWorkspaceUserListRoute, MY_WORKSPACE_LIST_ROUTE} from "../../../../constants/route";
 import { T_APP_HEADER_NAV_HOME, T_APP_HEADER_NAV_USERS } from "../../../../constants/translation";
-import "./AppNav.scss";
 import { Icon } from "../../../../fi/hg/frontend/components/icon/Icon";
 import { HomeIcon, UserListIcon } from "../../../../assets/icons";
+import {useCurrentWorkspaceId} from "../../../../hooks/workspace/useCurrentWorkspaceId";
+import "./AppNav.scss";
 
 export interface AppNavProps {
     readonly t : TranslationFunction;
@@ -19,6 +20,9 @@ export function AppNav (props: AppNavProps) {
     const t = props?.t;
     const className = props?.className;
 
+    const workspaceId = useCurrentWorkspaceId();
+    const workspaceUserListRoute = workspaceId ? getWorkspaceUserListRoute(workspaceId): MY_WORKSPACE_LIST_ROUTE;
+
     return (
         <nav className={
             APP_NAV_CLASS_NAME
@@ -38,7 +42,7 @@ export function AppNav (props: AppNavProps) {
 
                 <NavLink
                     className={`${APP_NAV_CLASS_NAME}-section-item`}
-                    to={USER_LIST_ROUTE}
+                    to={workspaceUserListRoute}
                 ><Icon><UserListIcon /></Icon> <span className={`${APP_NAV_CLASS_NAME}-section-item-text`}>{t(T_APP_HEADER_NAV_USERS)}</span></NavLink>
 
             </section>
diff --git a/frontend/src/components/common/modal/closeAppModalButton/CloseAppModalButton.tsx b/frontend/src/components/common/modal/closeAppModalButton/CloseAppModalButton.tsx
index e862ba6..1ff8faf 100644
--- a/frontend/src/components/common/modal/closeAppModalButton/CloseAppModalButton.tsx
+++ b/frontend/src/components/common/modal/closeAppModalButton/CloseAppModalButton.tsx
@@ -3,7 +3,7 @@
 import { CLOSE_APP_MODAL_BUTTON_CLASS_NAME } from "../../../../constants/appClassName";
 import { Button } from "../../../../fi/hg/frontend/components/button/Button";
 import { ButtonStyle } from "../../../../fi/hg/core/frontend/button/ButtonStyle";
-import { useAppCallback } from "../../../../hooks/modal/useAppCallback";
+import {useAppNavigateCallback} from "../../../../hooks/modal/useAppNavigateCallback";
 import "./CloseAppModalButton.scss";
 
 export interface CloseAppModalButtonProps {
@@ -12,7 +12,7 @@ export interface CloseAppModalButtonProps {
 
 export function CloseAppModalButton (props: CloseAppModalButtonProps) {
     const className = props?.className;
-    const closeModalCallback = useAppCallback();
+    const closeModalCallback = useAppNavigateCallback();
     return (
         <Button
             className={
diff --git a/frontend/src/components/common/modal/openAppModalButton/OpenAppModalButton.tsx b/frontend/src/components/common/modal/openAppModalButton/OpenAppModalButton.tsx
index 4f2cafd..d0e6529 100644
--- a/frontend/src/components/common/modal/openAppModalButton/OpenAppModalButton.tsx
+++ b/frontend/src/components/common/modal/openAppModalButton/OpenAppModalButton.tsx
@@ -1,17 +1,18 @@
-// Copyright (c) 2022. Heusala Group Oy <info@heusalagroup.fi>. All rights reserved.
+// Copyright (c) 2023. Heusala Group Oy <info@heusalagroup.fi>. All rights reserved.
 
-import { useAppCallback } from "../../../../hooks/modal/useAppCallback";
 import { AppModalType } from "../../../../types/AppModalType";
 import { ButtonStyle } from "../../../../fi/hg/core/frontend/button/ButtonStyle";
 import { Button } from "../../../../fi/hg/frontend/components/button/Button";
 import { OPEN_APP_MODAL_BUTTON_CLASS_NAME } from "../../../../constants/appClassName";
 import { ReactNode } from "react";
+import {useAppWithRouteCallback} from "../../../../hooks/modal/useAppWithRouteCallback";
 import "./OpenAppModalButton.scss";
 
 export interface OpenAppModalButtonProps {
     readonly className ?: string;
     readonly modal ?: AppModalType | undefined;
     readonly id ?: string | undefined;
+    readonly parentId ?: string | undefined;
     readonly children ?: ReactNode;
     readonly style ?: ButtonStyle;
 }
@@ -20,8 +21,9 @@ export function OpenAppModalButton (props: OpenAppModalButtonProps) {
     const className = props?.className;
     const modal = props?.modal;
     const id = props?.id;
+    const parentId = props?.parentId;
     const style = props?.style ?? ButtonStyle.LINK;
-    const openAddUserModalCallback = useAppCallback(modal, id);
+    const openAddUserModalCallback = useAppWithRouteCallback(modal, parentId, id);
     return (
         <Button
             className={
diff --git a/frontend/src/components/common/user/openEditUserModalButton/OpenEditUserModalButton.tsx b/frontend/src/components/common/user/openEditUserModalButton/OpenEditUserModalButton.tsx
index c046f6e..04391de 100644
--- a/frontend/src/components/common/user/openEditUserModalButton/OpenEditUserModalButton.tsx
+++ b/frontend/src/components/common/user/openEditUserModalButton/OpenEditUserModalButton.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2022. Heusala Group Oy <info@heusalagroup.fi>. All rights reserved.
+// Copyright (c) 2023. Heusala Group Oy <info@heusalagroup.fi>. All rights reserved.
 
 import { OpenAppModalButton } from "../../modal/openAppModalButton/OpenAppModalButton";
 import { AppModalType } from "../../../../types/AppModalType";
@@ -9,18 +9,20 @@ import { ButtonStyle } from "../../../../fi/hg/core/frontend/button/ButtonStyle"
 export interface OpenEditUserModalButtonProps {
     readonly id : string;
     readonly style ?: ButtonStyle;
+    readonly parentId: string;
 }
-
 export function OpenEditUserModalButton (
     props: OpenEditUserModalButtonProps
 ) {
     const id = props?.id;
+    const parentId = props?.parentId;
     const style = props?.style ?? ButtonStyle.LINK;
     return (
         <OpenAppModalButton
             modal={AppModalType.EDIT_USER_MODAL}
             id={id}
+            parentId={parentId}
             style={style}
         ><Icon><EditIcon /></Icon></OpenAppModalButton>
     );
-}
+}
\ No newline at end of file
diff --git a/frontend/src/components/common/workspace/selectWorkspaceButton/SelectWorkspaceButton.tsx b/frontend/src/components/common/workspace/selectWorkspaceButton/SelectWorkspaceButton.tsx
index 6822822..cade034 100644
--- a/frontend/src/components/common/workspace/selectWorkspaceButton/SelectWorkspaceButton.tsx
+++ b/frontend/src/components/common/workspace/selectWorkspaceButton/SelectWorkspaceButton.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2022. Heusala Group Oy <info@heusalagroup.fi>. All rights reserved.
+// Copyright (c) 2023. Heusala Group Oy <info@heusalagroup.fi>. All rights reserved.
 
 import { Icon } from "../../../../fi/hg/frontend/components/icon/Icon";
 import { SignInIcon } from "../../../../assets/icons";
@@ -7,6 +7,8 @@ import { ReactNode, useCallback } from "react";
 import { WorkspaceService } from "../../../../services/WorkspaceService";
 import { Workspace } from "../../../../fi/hg/dashboard/types/Workspace";
 import { ButtonStyle } from "../../../../fi/hg/core/frontend/button/ButtonStyle";
+import {RouteService} from "../../../../fi/hg/frontend/services/RouteService";
+import {getWorkspaceAboutRoute, MY_WORKSPACE_LIST_ROUTE} from "../../../../constants/route";
 
 export interface SelectWorkspaceButtonProps {
     readonly className?: string;
@@ -18,12 +20,17 @@ export function SelectWorkspaceButton (props: SelectWorkspaceButtonProps) {
     const className = props?.className;
     const workspace = props?.workspace;
     const children = props?.children;
+
+    const workspaceAboutRoute = workspace ? getWorkspaceAboutRoute(workspace.id): MY_WORKSPACE_LIST_ROUTE;
+
     const onClick = useCallback(
         () => {
-            WorkspaceService.setCurrentWorkspace(workspace);
+            WorkspaceService.setCurrentWorkspace(workspace).then(()=>{
+                RouteService.setRoute(workspaceAboutRoute);
+            });
         },
         [
-            workspace
+            workspace, workspaceAboutRoute
         ]
     );
     return (
@@ -33,6 +40,6 @@ export function SelectWorkspaceButton (props: SelectWorkspaceButtonProps) {
                 className ? className : ''
             }
             click={onClick}
-        ><Icon><SignInIcon /></Icon> {children}</Button>
+        ><Icon><SignInIcon /></Icon>{children}</Button>
     );
-}
+}
\ No newline at end of file
diff --git a/frontend/src/components/dashboardApp/DashboardApp.tsx b/frontend/src/components/dashboardApp/DashboardApp.tsx
index 829b4d3..6f3a95e 100644
--- a/frontend/src/components/dashboardApp/DashboardApp.tsx
+++ b/frontend/src/components/dashboardApp/DashboardApp.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2022. Heusala Group Oy <info@heusalagroup.fi>. All rights reserved.
+// Copyright (c) 2023. Heusala Group Oy <info@heusalagroup.fi>. All rights reserved.
 
 import {
     Navigate,
@@ -6,14 +6,13 @@ import {
     useRoutes
 } from "react-router-dom";
 import {
-    INDEX_ROUTE,
     LOGIN_INDEX_ROUTE,
     MY_PROFILE_INDEX_ROUTE,
     NOT_FOUND_ROUTE,
     USER_LIST_ROUTE,
     USER_ROUTE,
     ABOUT_ROUTE,
-    MY_WORKSPACE_LIST_ROUTE, MY_INDEX_ROUTE
+    MY_WORKSPACE_LIST_ROUTE, MY_INDEX_ROUTE, WORKSPACE_INDEX_ROUTE
 } from "../../constants/route";
 import { LogService } from "../../fi/hg/core/LogService";
 import { useEmailAuthSession } from "../../fi/hg/frontend/hooks/useEmailAuthSession";
@@ -22,14 +21,14 @@ import { LoginView } from "../views/login/LoginView";
 import { AboutView } from "../views/about/AboutView";
 import { DARK_MAIN_LAYOUT_CLASS_NAME, DASHBOARD_APP_CLASS_NAME } from "../../constants/appClassName";
 import { useLanguageService } from "../../fi/hg/frontend/hooks/useLanguageService";
-import { UserView } from "../views/user/item/UserView";
 import { UserListView } from "../views/user/list/UserListView";
 import { WorkspaceListView } from "../views/workspace/list/WorkspaceListView";
 import { useRouteServiceWithNavigate } from "../../fi/hg/frontend/hooks/useRouteServiceWithNavigate";
 import { LayoutComponent } from "../../types/DashboardLayout";
-import "./DashboardApp.scss";
 import { useAppModal } from "../../hooks/modal/useAppModal";
 import { AppModalContainer } from "../common/layout/appModalContainer/AppModalContainer";
+import {EditUserModal} from "../modals/user/editUserModal/EditUserModal";
+import "./DashboardApp.scss";
 
 const LOG = LogService.createLogger('DashboardApp');
 
@@ -82,7 +81,7 @@ export function DashboardApp (
     };
 
     const mainRoutes = {
-        path: INDEX_ROUTE,
+        path: WORKSPACE_INDEX_ROUTE,
         element: (
             <MainLayout t={t}>
                 <WorkspaceLayout t={t}>
@@ -93,10 +92,11 @@ export function DashboardApp (
         ),
         children: [
             {path: ABOUT_ROUTE, element: <AboutView t={t} />},
-            {path: USER_LIST_ROUTE, element: <UserListView t={t} />},
-            {path: USER_ROUTE, element: <UserView t={t} />},
-            {path: '*', element: <Navigate to={ABOUT_ROUTE} />},
-            {path: NOT_FOUND_ROUTE, element: <Navigate to={ABOUT_ROUTE} />}
+            {path: USER_LIST_ROUTE, element: <UserListView t={t} />,
+                children:[
+                    {path:USER_ROUTE, element: <EditUserModal t={t} />}
+                ]},
+            {path: WORKSPACE_INDEX_ROUTE, element: <Navigate to={MY_WORKSPACE_LIST_ROUTE} />}
         ]
     };
 
@@ -112,14 +112,16 @@ export function DashboardApp (
         ),
         children: [
             {path: MY_WORKSPACE_LIST_ROUTE, element: <WorkspaceListView t={t} />},
-            {path: MY_PROFILE_INDEX_ROUTE, element: <ProfileView t={t} />}
+            {path: MY_PROFILE_INDEX_ROUTE, element: <ProfileView t={t} />},
+            {path: '*', element: <Navigate to={ABOUT_ROUTE} />},
+            {path: MY_INDEX_ROUTE, element: <Navigate to={WORKSPACE_INDEX_ROUTE} />}
         ]
     };
 
     const main = useRoutes(
         [
-            mainRoutes
-            , profileRoutes
+            mainRoutes,
+            profileRoutes
         ]
     );
 
@@ -129,10 +131,9 @@ export function DashboardApp (
         ]
     );
 
-    return <div className={DASHBOARD_APP_CLASS_NAME}>
 
+    return <div className={DASHBOARD_APP_CLASS_NAME}>
         { isLoggedIn ? main : login}
-
     </div>;
 
 }
diff --git a/frontend/src/components/modals/user/editUserModal/EditUserModal.scss b/frontend/src/components/modals/user/editUserModal/EditUserModal.scss
index c8bdb9a..4f6733b 100644
--- a/frontend/src/components/modals/user/editUserModal/EditUserModal.scss
+++ b/frontend/src/components/modals/user/editUserModal/EditUserModal.scss
@@ -29,7 +29,6 @@
 
     & > .edit-user-modal-header-close-button {
       box-sizing: border-box;
-      padding: 0;
       margin: 0;
       flex-shrink: 0;
     }
diff --git a/frontend/src/components/modals/user/editUserModal/EditUserModal.tsx b/frontend/src/components/modals/user/editUserModal/EditUserModal.tsx
index ee411c3..4b0de44 100644
--- a/frontend/src/components/modals/user/editUserModal/EditUserModal.tsx
+++ b/frontend/src/components/modals/user/editUserModal/EditUserModal.tsx
@@ -1,10 +1,9 @@
-// Copyright (c) 2022. Heusala Group Oy <info@heusalagroup.fi>. All rights reserved.
+// Copyright (c) 2023. Heusala Group Oy <info@heusalagroup.fi>. All rights reserved.
 
 import { EDIT_USER_MODAL_CLASS_NAME } from "../../../../constants/appClassName";
 import { CloseAppModalButton } from "../../../common/modal/closeAppModalButton/CloseAppModalButton";
 import { T_EDIT_USER_MODAL_TITLE } from "../../../../constants/translation";
 import { UserForm } from "../../../forms/userForm/UserForm";
-import { useAppCallback } from "../../../../hooks/modal/useAppCallback";
 import { LogService } from "../../../../fi/hg/core/LogService";
 import { useEventUserUpdated } from "../../../../hooks/user/useEventUserUpdated";
 import { useWorkspaceUser } from "../../../../hooks/user/useWorkspaceUser";
@@ -12,6 +11,7 @@ import { Loader } from "../../../../fi/hg/frontend/components/loader/Loader";
 import { TranslationFunction } from "../../../../fi/hg/core/types/TranslationFunction";
 import { useCurrentWorkspaceId } from "../../../../hooks/workspace/useCurrentWorkspaceId";
 import { useAppModalCurrentId } from "../../../../hooks/modal/useAppModalCurrentId";
+import {useAppNavigateCallback} from "../../../../hooks/modal/useAppNavigateCallback";
 import "./EditUserModal.scss";
 
 const LOG = LogService.createLogger('EditUserModal');
@@ -24,7 +24,7 @@ export interface NewUserFormProps {
 export function EditUserModal (props: NewUserFormProps) {
     const t = props?.t;
     const className = props?.className;
-    const closeModalCallback = useAppCallback();
+    const closeModalCallback = useAppNavigateCallback();
     const workspaceId = useCurrentWorkspaceId();
     const appModalId = useAppModalCurrentId();
     const [user] = useWorkspaceUser(workspaceId, appModalId );
diff --git a/frontend/src/components/views/user/item/UserView.scss b/frontend/src/components/views/user/item/UserView.scss
deleted file mode 100644
index 41d522e..0000000
--- a/frontend/src/components/views/user/item/UserView.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-
-.user-view {
-
-}
diff --git a/frontend/src/components/views/user/item/UserView.tsx b/frontend/src/components/views/user/item/UserView.tsx
deleted file mode 100644
index 6a1736e..0000000
--- a/frontend/src/components/views/user/item/UserView.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2022. Heusala Group Oy <info@heusalagroup.fi>. All rights reserved.
-
-import { USER_VIEW_CLASS_NAME } from "../../../../constants/appClassName";
-import { TFunction } from "i18next";
-import "./UserView.scss";
-
-export interface UserViewProps {
-    readonly t: TFunction;
-    readonly className ?: string;
-}
-
-export function UserView (props: UserViewProps) {
-
-    const className = props?.className;
-
-    return (
-        <div className={
-            USER_VIEW_CLASS_NAME
-            + (className? ` ${className}` : '')
-        }>
-
-            User view
-
-        </div>
-    );
-
-}
diff --git a/frontend/src/components/views/user/list/UserListView.tsx b/frontend/src/components/views/user/list/UserListView.tsx
index 3aead51..1bc807a 100644
--- a/frontend/src/components/views/user/list/UserListView.tsx
+++ b/frontend/src/components/views/user/list/UserListView.tsx
@@ -1,36 +1,44 @@
 // Copyright (c) 2022. Heusala Group Oy <info@heusalagroup.fi>. All rights reserved.
 
-import { USER_LIST_VIEW_CLASS_NAME } from "../../../../constants/appClassName";
-import { TFunction } from "i18next";
-import { useWorkspaceUserList } from "../../../../hooks/user/useWorkspaceUserList";
-import { T_USER_LIST_TITLE, T_USER_TABLE_EMAIL_TITLE, T_USER_TABLE_NAME_TITLE, T_USER_TABLE_NO_RESULTS } from "../../../../constants/translation";
-import { map } from "../../../../fi/hg/core/functions/map";
-import { OpenNewUserModalButton } from "../../../common/user/openNewUserModalButton/OpenNewUserModalButton";
-import { OpenEditUserModalButton } from "../../../common/user/openEditUserModalButton/OpenEditUserModalButton";
-import { useEventUserAdded } from "../../../../hooks/user/useEventUserAdded";
-import { LogService } from "../../../../fi/hg/core/LogService";
-import { useEventUserRemoved } from "../../../../hooks/user/useEventUserRemoved";
-import { useEventUserUpdated } from "../../../../hooks/user/useEventUserUpdated";
-import { useEventCurrentWorkspaceChanged } from "../../../../hooks/workspace/useEventCurrentWorkspaceChanged";
-import { useIntervalUpdate } from "../../../../fi/hg/frontend/hooks/useIntervalUpdate";
-import { USER_LIST_UPDATE_INTERVAL_IN_MS } from "../../../../constants/frontend";
-import { useCurrentWorkspaceId } from "../../../../hooks/workspace/useCurrentWorkspaceId";
-import { Loader } from "../../../../fi/hg/frontend/components/loader/Loader";
-import { ButtonStyle } from "../../../../fi/hg/core/frontend/button/ButtonStyle";
-import { TableHeaderColumn } from "../../../../fi/hg/frontend/components/table/TableHeaderColumn";
-import { TableHeader } from "../../../../fi/hg/frontend/components/table/TableHeader";
-import { TableBody } from "../../../../fi/hg/frontend/components/table/TableBody";
-import { Table } from "../../../../fi/hg/frontend/components/table/Table";
-import { TableColumn } from "../../../../fi/hg/frontend/components/table/TableColumn";
-import { TableRow } from "../../../../fi/hg/frontend/components/table/TableRow";
-import { User } from "../../../../fi/hg/dashboard/types/User";
+import {USER_LIST_VIEW_CLASS_NAME} from "../../../../constants/appClassName";
+import {TFunction} from "i18next";
+import {useWorkspaceUserList} from "../../../../hooks/user/useWorkspaceUserList";
+import {
+    T_USER_LIST_TITLE,
+    T_USER_TABLE_EMAIL_TITLE,
+    T_USER_TABLE_NAME_TITLE,
+    T_USER_TABLE_NO_RESULTS
+} from "../../../../constants/translation";
+import {map} from "../../../../fi/hg/core/functions/map";
+import {OpenNewUserModalButton} from "../../../common/user/openNewUserModalButton/OpenNewUserModalButton";
+import {useEventUserAdded} from "../../../../hooks/user/useEventUserAdded";
+import {LogService} from "../../../../fi/hg/core/LogService";
+import {useEventUserRemoved} from "../../../../hooks/user/useEventUserRemoved";
+import {useEventUserUpdated} from "../../../../hooks/user/useEventUserUpdated";
+import {useEventCurrentWorkspaceChanged} from "../../../../hooks/workspace/useEventCurrentWorkspaceChanged";
+import {useIntervalUpdate} from "../../../../fi/hg/frontend/hooks/useIntervalUpdate";
+import {USER_LIST_UPDATE_INTERVAL_IN_MS} from "../../../../constants/frontend";
+import {useCurrentWorkspaceId} from "../../../../hooks/workspace/useCurrentWorkspaceId";
+import {Loader} from "../../../../fi/hg/frontend/components/loader/Loader";
+import {TableHeaderColumn} from "../../../../fi/hg/frontend/components/table/TableHeaderColumn";
+import {TableHeader} from "../../../../fi/hg/frontend/components/table/TableHeader";
+import {TableBody} from "../../../../fi/hg/frontend/components/table/TableBody";
+import {Table} from "../../../../fi/hg/frontend/components/table/Table";
+import {TableColumn} from "../../../../fi/hg/frontend/components/table/TableColumn";
+import {TableRow} from "../../../../fi/hg/frontend/components/table/TableRow";
+import {User} from "../../../../fi/hg/dashboard/types/User";
+import {ReactNode} from "react";
+import {OpenEditUserModalButton} from "../../../common/user/openEditUserModalButton/OpenEditUserModalButton";
+import {ButtonStyle} from "../../../../fi/hg/core/frontend/button/ButtonStyle";
 import "./UserListView.scss";
 
+
 const LOG = LogService.createLogger('UserListView');
 
 export interface UserListViewProps {
     readonly t: TFunction;
     readonly className ?: string;
+    readonly children ?: ReactNode;
 }
 
 export function UserListView (props: UserListViewProps) {
@@ -38,6 +46,7 @@ export function UserListView (props: UserListViewProps) {
     const workspaceId = useCurrentWorkspaceId();
     const t = props?.t;
     const className = props?.className;
+
     const [userList, refreshCallback] = useWorkspaceUserList(workspaceId);
 
     useEventUserAdded(() => {
@@ -86,7 +95,7 @@ export function UserListView (props: UserListViewProps) {
                 </div>
             </header>
 
-            <Table className={USER_LIST_VIEW_CLASS_NAME+'-table'}>
+             <Table className={USER_LIST_VIEW_CLASS_NAME+'-table'}>
 
                 <TableHeader>
                     <TableHeaderColumn first={true}>{t(T_USER_TABLE_NAME_TITLE)}</TableHeaderColumn>
@@ -124,16 +133,15 @@ export function UserListView (props: UserListViewProps) {
                                     className={USER_LIST_VIEW_CLASS_NAME+'-column ' + USER_LIST_VIEW_CLASS_NAME+'-column-controls'}
                                     last={true}
                                 >
-                                        <OpenEditUserModalButton id={item.id} style={ButtonStyle.SECONDARY} />
+                                    <OpenEditUserModalButton id={item.id} parentId={workspaceId} style={ButtonStyle.SECONDARY} />
                                 </TableColumn>
 
                             </TableRow>
                         );
                     })
-                }</TableBody>
+                }
+                </TableBody>
             </Table>
 
-        </div>
-    );
-
-}
+        </div>)
+    }
diff --git a/frontend/src/components/views/workspace/list/WorkspaceListView.tsx b/frontend/src/components/views/workspace/list/WorkspaceListView.tsx
index 658d451..79b9075 100644
--- a/frontend/src/components/views/workspace/list/WorkspaceListView.tsx
+++ b/frontend/src/components/views/workspace/list/WorkspaceListView.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2022. Heusala Group Oy <info@heusalagroup.fi>. All rights reserved.
+// Copyright (c) 2023. Heusala Group Oy <info@heusalagroup.fi>. All rights reserved.
 
 import { WORKSPACE_LIST_VIEW_CLASS_NAME } from "../../../../constants/appClassName";
 import { TFunction } from "i18next";
@@ -14,8 +14,6 @@ import { LogService } from "../../../../fi/hg/core/LogService";
 import { useIntervalUpdate } from "../../../../fi/hg/frontend/hooks/useIntervalUpdate";
 import { WORKSPACE_LIST_UPDATE_INTERVAL_IN_MS } from "../../../../constants/frontend";
 import { Loader } from "../../../../fi/hg/frontend/components/loader/Loader";
-import { useNavigate } from "react-router-dom";
-import { ABOUT_ROUTE } from "../../../../constants/route";
 import { useCallback } from "react";
 import { useEmailAuthSession } from "../../../../fi/hg/frontend/hooks/useEmailAuthSession";
 import { EmailUtils } from "../../../../fi/hg/core/EmailUtils";
@@ -40,9 +38,6 @@ export function WorkspaceListView (props: WorkspaceListViewProps) {
     const t = props?.t;
     const className = props?.className;
     const [workspaceList, refreshCallback] = useWorkspaceList();
-
-    const navigate = useNavigate();
-
     const session = useEmailAuthSession();
     const email = session?.email;
     const emailDomain = email ? EmailUtils.getEmailDomain(email) : undefined;
@@ -51,12 +46,10 @@ export function WorkspaceListView (props: WorkspaceListViewProps) {
 
     const workspaceAddedCallback = useCallback(
         () => {
-            LOG.debug(`Workspace changed, move to about view`);
+            LOG.info(`Workspace changed, move to about view`);
             refreshCallback();
-            navigate(ABOUT_ROUTE);
         },
         [
-            navigate,
             refreshCallback
         ]
     );
@@ -77,21 +70,21 @@ export function WorkspaceListView (props: WorkspaceListViewProps) {
     }
 
     return (
+
         <div className={
             WORKSPACE_LIST_VIEW_CLASS_NAME
             + (className? ` ${className}` : '')
         }>
-
-            <header className={WORKSPACE_LIST_VIEW_CLASS_NAME+'-header'}>
-                <h3 className={WORKSPACE_LIST_VIEW_CLASS_NAME+'-header-title'}>{t(T_WORKSPACE_LIST_TITLE)}</h3>
-                <div className={WORKSPACE_LIST_VIEW_CLASS_NAME+'-header-controls'}>
-                    {canCreateWorkspace? (
-                        <OpenNewWorkspaceModalButton />
-                    ) : null}
+            <header className={WORKSPACE_LIST_VIEW_CLASS_NAME + '-header'}>
+                <h3 className={WORKSPACE_LIST_VIEW_CLASS_NAME + '-header-title'}>{t(T_WORKSPACE_LIST_TITLE)}</h3>
+                <div className={WORKSPACE_LIST_VIEW_CLASS_NAME + '-header-controls'}>
+                    {canCreateWorkspace ? (
+                                <OpenNewWorkspaceModalButton/>
+                            ) : null}
                 </div>
             </header>
 
-            <table className={WORKSPACE_LIST_VIEW_CLASS_NAME+'-table'}>
+            <table className={WORKSPACE_LIST_VIEW_CLASS_NAME + '-table'}>
                 <thead>
                 <tr>
                     <th>{t(T_WORKSPACE_TABLE_NAME_TITLE)}</th>
@@ -101,16 +94,16 @@ export function WorkspaceListView (props: WorkspaceListViewProps) {
                     (workspaceList?.length ?? 0) === 0 ? (
                         <>
                             <tr>
-                                <td className={WORKSPACE_LIST_VIEW_CLASS_NAME+'-no-results'}>{t(T_WORKSPACE_LIST_VIEW_NO_RESULTS)}</td>
+                                <td className={WORKSPACE_LIST_VIEW_CLASS_NAME + '-no-results'}>{t(T_WORKSPACE_LIST_VIEW_NO_RESULTS)}</td>
                             </tr>
                         </>
-                    ) : map(workspaceList, (item : Workspace) => {
+                    ) : map(workspaceList, (item: Workspace) => {
                         return (
                             <tr key={`workspace-item-${item?.id}`}>
-                                <td className={WORKSPACE_LIST_VIEW_CLASS_NAME+'-column-name'}>
+                                <td className={WORKSPACE_LIST_VIEW_CLASS_NAME + '-column-name'}>
                                     <SelectWorkspaceButton
-                                        className={WORKSPACE_LIST_VIEW_CLASS_NAME+'-workspace-button'}
-                                        workspace={item}>{ (item.name === '' ? undefined : item.name) ?? item.id }</SelectWorkspaceButton>
+                                        className={WORKSPACE_LIST_VIEW_CLASS_NAME + '-workspace-button'}
+                                        workspace={item}>{(item.name === '' ? undefined : item.name) ?? item.id}</SelectWorkspaceButton>
                                 </td>
                             </tr>
                         );
diff --git a/frontend/src/constants/route.ts b/frontend/src/constants/route.ts
index 52a61d9..8631c0d 100644
--- a/frontend/src/constants/route.ts
+++ b/frontend/src/constants/route.ts
@@ -4,15 +4,18 @@ export const INDEX_ROUTE = '/';
 export const NOT_FOUND_ROUTE = '/';
 export const LOGIN_INDEX_ROUTE = '/';
 
-export const ABOUT_ROUTE = '/about';
-
 export const MY_INDEX_ROUTE = '/my';
 export const MY_PROFILE_INDEX_ROUTE = '/my/profile';
 export const MY_WORKSPACE_LIST_ROUTE = '/my/workspaces';
 
-export const USER_LIST_ROUTE = '/users';
-export const USER_ROUTE = '/users/:id';
-export const getUserRoute = (c: string) => `/users/${q(c)}`;
+export const WORKSPACE_INDEX_ROUTE = '/workspace';
+export const ABOUT_ROUTE = '/workspace/:parentId/about'; //about
+export const USER_LIST_ROUTE = '/workspace/:parentId/users';
+export const USER_ROUTE = '/workspace/:parentId/users/:id';
+export const getUserRoute = (c: string, d:string) => `/workspace/${q(c)}/users/${q(d)}`;
+export const getWorkspaceUserListRoute = (workspaceId: string) => `/workspace/${q(workspaceId)}/users`;
+export const getWorkspaceRoute = (c: string) => `/workspace/${q(c)}`;
+export const getWorkspaceAboutRoute = (c: string) => `/workspace/${q(c)}/about`;
 
 function q(value: string): string {
     return encodeURIComponent(value);
diff --git a/frontend/src/fi/hg/core b/frontend/src/fi/hg/core
index 97c6792..9eec067 160000
--- a/frontend/src/fi/hg/core
+++ b/frontend/src/fi/hg/core
@@ -1 +1 @@
-Subproject commit 97c67921ae5ded832d9f19a5cc86e1f88a1f0062
+Subproject commit 9eec0676d58a1257f7b0cd038475bd3bbec58c95
diff --git a/frontend/src/fi/hg/dashboard b/frontend/src/fi/hg/dashboard
index fd071c6..6c60546 160000
--- a/frontend/src/fi/hg/dashboard
+++ b/frontend/src/fi/hg/dashboard
@@ -1 +1 @@
-Subproject commit fd071c63929ac3c712b4b1266ceb290f1611b05f
+Subproject commit 6c60546d7905b01f5edc8f7290b261aaae6c2443
diff --git a/frontend/src/hooks/modal/useAppNavigateCallback.ts b/frontend/src/hooks/modal/useAppNavigateCallback.ts
new file mode 100644
index 0000000..90974cc
--- /dev/null
+++ b/frontend/src/hooks/modal/useAppNavigateCallback.ts
@@ -0,0 +1,36 @@
+// Copyright (c) 2023. Heusala Group Oy <info@heusalagroup.fi>. All rights reserved.
+
+import { useCallback } from "react";
+import { AppModalType } from "../../types/AppModalType";
+import { AppModalService } from "../../services/AppModalService";
+import { ButtonClickCallback } from "../../fi/hg/frontend/components/button/Button";
+import { LogService } from "../../fi/hg/core/LogService";
+import {useNavigate} from "react-router-dom";
+
+const LOG = LogService.createLogger('useAppNavigateCallback');
+
+/**
+ * Can be used to create a callback function to open a specific modal
+ *
+ * @param modal
+ * @param id
+ * Navigate -1, when close the modal. This is where this modal have opened, url will be changed!
+ */
+export function useAppNavigateCallback (
+    modal ?: AppModalType | undefined,
+    id    ?: string | undefined
+) : ButtonClickCallback {
+    const navigate = useNavigate();
+
+    return useCallback(
+        () => {
+            LOG.info(`Opening modal `, modal, id);
+            AppModalService.setCurrentModal(modal, id);
+            navigate(-1)
+        },
+        [
+            modal,
+            id, navigate
+        ]
+    );
+}
diff --git a/frontend/src/hooks/modal/useAppWithRouteCallback.ts b/frontend/src/hooks/modal/useAppWithRouteCallback.ts
new file mode 100644
index 0000000..11712e6
--- /dev/null
+++ b/frontend/src/hooks/modal/useAppWithRouteCallback.ts
@@ -0,0 +1,41 @@
+// Copyright (c) 2023. Heusala Group Oy <info@heusalagroup.fi>. All rights reserved.
+
+import { useCallback } from "react";
+import { AppModalType } from "../../types/AppModalType";
+import { AppModalService } from "../../services/AppModalService";
+import { ButtonClickCallback } from "../../fi/hg/frontend/components/button/Button";
+import { LogService } from "../../fi/hg/core/LogService";
+import {RouteService} from "../../fi/hg/frontend/services/RouteService";
+import {getUserRoute, MY_WORKSPACE_LIST_ROUTE} from "../../constants/route";
+
+const LOG = LogService.createLogger('useAppWithRouteCallback');
+
+/**
+ * Can be used to create a callback function to open a specific modal
+ *
+ * @param modal
+ * @param id
+ */
+export function useAppWithRouteCallback (
+    modal ?: AppModalType | undefined,
+    parentId ?:string | undefined,
+    id    ?: string | undefined
+) : ButtonClickCallback {
+    return useCallback(
+        () => {
+            const workspaceId = parentId;
+            const editedUserRoute = workspaceId && id? getUserRoute(workspaceId, id): MY_WORKSPACE_LIST_ROUTE;
+
+            LOG.info(`Opening modal `, modal, id, workspaceId);
+            LOG.info(`Set Route `, editedUserRoute);
+
+            AppModalService.setCurrentModal(modal, id);
+            RouteService.setRoute(editedUserRoute);
+        },
+        [
+            modal,
+            id,
+            parentId
+        ]
+    );
+}
diff --git a/frontend/src/hooks/user/useEventCurrentUserChanged.ts b/frontend/src/hooks/user/useEventCurrentUserChanged.ts
new file mode 100644
index 0000000..d76e274
--- /dev/null
+++ b/frontend/src/hooks/user/useEventCurrentUserChanged.ts
@@ -0,0 +1,19 @@
+// Copyright (c) 2023. Heusala Group Oy <info@heusalagroup.fi>. All rights reserved.
+
+import { UserService, UserServiceEvent } from "../../services/UserService";
+import { VoidCallback } from "../../fi/hg/core/interfaces/callbacks";
+import { useServiceEvent } from "../../fi/hg/frontend/hooks/useServiceEvent";
+
+/**
+ *
+ * @param callback If callback has dependencies, you should wrap it inside useCallback!
+ */
+export function useEventCurrentUserChanged (
+    callback: VoidCallback
+) {
+    return useServiceEvent<UserServiceEvent>(
+        UserService,
+        UserServiceEvent.CURRENT_USER_CHANGED,
+        callback
+    );
+}
diff --git a/frontend/src/hooks/user/useWorkspaceUser.ts b/frontend/src/hooks/user/useWorkspaceUser.ts
index 0f4febc..d404b8c 100644
--- a/frontend/src/hooks/user/useWorkspaceUser.ts
+++ b/frontend/src/hooks/user/useWorkspaceUser.ts
@@ -24,7 +24,7 @@ export function useWorkspaceUser (
                     LOG.error(`useUser: Failed to load user "${userId}" for workspace "${workspaceId}": `, err);
                 });
             } else {
-                LOG.debug(`useWorkspaceUser: Did not have workspaceId and/or userId`);
+                LOG.debug(`useWorkspaceUser: Did not have workspaceId "${workspaceId}" and/or userId "${userId}"`);
             }
         },
         [
diff --git a/frontend/src/hooks/workspace/useUrlLink.ts b/frontend/src/hooks/workspace/useUrlLink.ts
new file mode 100644
index 0000000..3e49e07
--- /dev/null
+++ b/frontend/src/hooks/workspace/useUrlLink.ts
@@ -0,0 +1,60 @@
+// Copyright (c) 2023. Heusala Group Oy <info@heusalagroup.fi>. All rights reserved.
+
+/**
+ * If user has url link... this
+ * find user's workspaces and check if urls workspace is there
+ * set current workspace
+ * set route
+ * open modal
+ * */
+import {useCallback, useEffect, useState} from "react";
+import {WorkspaceService} from "../../services/WorkspaceService";
+import {Workspace} from "../../fi/hg/dashboard/types/Workspace";
+import {VoidCallback} from "../../fi/hg/core/interfaces/callbacks";
+import {LogService} from "../../fi/hg/core/LogService";
+import {RouteService} from "../../fi/hg/frontend/services/RouteService";
+import {AppModalService} from "../../services/AppModalService";
+import {AppModalType} from "../../types/AppModalType";
+
+const LOG = LogService.createLogger('useUrlWorkspaceName');
+
+export function useUrlLink (
+    workspaceByUrl ?: string,
+    userByUrl ?: string
+):VoidCallback {
+
+return useCallback(
+        async () => {
+            try {
+
+                const workspaceList = await WorkspaceService.getMyWorkspaceList();
+                const workspace = workspaceList?.find(listItem => listItem.id === workspaceByUrl)
+
+                LOG.info("Set current workspace: ", workspace )
+
+                const modal = AppModalService.getCurrentModal();
+
+                if(modal !== AppModalType.EDIT_USER_MODAL) {
+
+                    await WorkspaceService.setCurrentWorkspace(workspace).then(() => {
+                        LOG.info("Current workspace has set: ", workspace?.name)
+                        RouteService.setRoute('/workspace/' + workspace?.id + '/users/' + userByUrl);
+
+                        LOG.info("Just opening new modal ... ")
+                        AppModalService.setCurrentModal(AppModalType.EDIT_USER_MODAL, userByUrl);
+
+                        return;
+                    });
+                }
+
+
+            } catch (err) {
+                LOG.debug(`Failed to load workspace list: `, err);
+            }
+        },
+        [
+            workspaceByUrl, userByUrl
+        ]
+    );
+
+}
diff --git a/frontend/src/layouts/dark/main/DarkMainLayout.tsx b/frontend/src/layouts/dark/main/DarkMainLayout.tsx
index 5175c82..409e524 100644
--- a/frontend/src/layouts/dark/main/DarkMainLayout.tsx
+++ b/frontend/src/layouts/dark/main/DarkMainLayout.tsx
@@ -3,11 +3,31 @@
 import { DARK_MAIN_LAYOUT_CLASS_NAME } from "../../../constants/appClassName";
 import { LayoutProps } from "../../../types/DashboardLayout";
 import { AppHeader } from "../../../components/common/layout/appHeader/AppHeader";
+import {LogService} from "../../../fi/hg/core/LogService";
+import {useParams} from "react-router-dom";
+import {useUrlLink} from "../../../hooks/workspace/useUrlLink";
 import "./DarkMainLayout.scss";
+import {AppModalType} from "../../../types/AppModalType";
+import {AppModalService} from "../../../services/AppModalService";
+import {useCurrentWorkspaceName} from "../../../hooks/workspace/useCurrentWorkspaceName";
 
+const LOG = LogService.createLogger('DarkMainLayout');
 export function DarkMainLayout (props: LayoutProps) {
     const children = props.children;
     const t = props.t;
+
+    const opts = useParams<string>();
+    const userId = opts?.id ?? undefined;
+    const workspaceId = opts?.parentId ?? undefined;
+
+    const openModal = useUrlLink(workspaceId, userId);
+
+    const workspaceName = useCurrentWorkspaceName();
+
+    if(!workspaceName){
+        openModal();
+    }
+
     return (
         <div className={DARK_MAIN_LAYOUT_CLASS_NAME}>
             <AppHeader
@@ -15,6 +35,7 @@ export function DarkMainLayout (props: LayoutProps) {
                 t={t}
             />
             <section className={`${DARK_MAIN_LAYOUT_CLASS_NAME}-content`}>{children}</section>
+
         </div>
     );
 }
diff --git a/frontend/src/services/ProfileService.ts b/frontend/src/services/ProfileService.ts
new file mode 100644
index 0000000..56d76a8
--- /dev/null
+++ b/frontend/src/services/ProfileService.ts
@@ -0,0 +1,102 @@
+// Copyright (c) 2021-2022. Heusala Group Oy <info@heusalagroup.fi>. All rights reserved.
+
+import { EmailTokenDTO } from "../fi/hg/core/auth/email/types/EmailTokenDTO";
+import { Observer, ObserverCallback, ObserverDestructor } from "../fi/hg/core/Observer";
+import { EmailAuthSessionService } from "../fi/hg/frontend/services/EmailAuthSessionService";
+import { User } from "../fi/hg/dashboard/types/User";
+import { DashboardClient } from "../fi/hg/dashboard/services/DashboardClient";
+import { LogService } from "../fi/hg/core/LogService";
+import {WorkspaceService} from "./WorkspaceService";
+import {UserService} from "./UserService";
+
+const LOG = LogService.createLogger('ProfileService');
+
+export enum ProfileServiceEvent {
+    PROFILE_ADDED = "ProfileService:itemAdded",
+    PROFILE_UPDATED = "ProfileService:itemUpdated",
+    PROFILE_REMOVED = "ProfileService:itemRemoved",
+
+    /**
+     * Triggered when current profile is changed.
+     *
+     * Use `UserService.getWorkspaceId()` to fetch the new ID.
+     */
+    CURRENT_PROFILE_CHANGED = "ProfileService:currentProfileChanged"
+}
+
+export type ProfileServiceDestructor = ObserverDestructor;
+
+export class ProfileService {
+
+    private static _observer : Observer<ProfileServiceEvent> = new Observer<ProfileServiceEvent>("ProfileService");
+
+    public static Event = ProfileServiceEvent;
+
+    public static on(
+        name: ProfileServiceEvent,
+        callback: ObserverCallback<ProfileServiceEvent>
+    ): ProfileServiceDestructor {
+        return this._observer.listenEvent(name, callback);
+    }
+
+    public static destroy (): void {
+        this._observer.destroy();
+    }
+
+
+    /**
+     * get USER information based on workspace */
+    public static async getWorkspaceUserByProfile (
+        workspaceId : string
+    ): Promise<User | undefined> {
+
+        const token: EmailTokenDTO | undefined = EmailAuthSessionService.getEmailToken();
+        if (!token) {
+            LOG.debug(`getWorkspaceUserList: No session`);
+            return undefined;
+        }
+        const client = new DashboardClient(); // FIXME: Save client somewhere in a service as reusable
+        client.setSessionToken(token);
+        if (!client.hasVerifiedSession()) {
+            LOG.debug(`getWorkspaceUserList: No verified session`);
+            return undefined;
+        }
+
+        if (!workspaceId) {
+            LOG.debug(`getMyUserList: No workspace`);
+            return undefined;
+        }
+
+        return await client.getWorkspaceUserByProfile(workspaceId);
+
+    }
+
+
+    public static initialize () {
+        LOG.info(`Initializing users profile`);
+        this._initializeProfile().catch((err) => {
+            LOG.error(`ERROR: Could not initialize profile: `, err);
+        });
+    }
+
+    /**
+     * set current user
+     * */
+    public static async _initializeProfile () {
+        const email: string | undefined = EmailAuthSessionService.getEmailAddress();
+        LOG.debug("User email;", email)
+        const workspace = WorkspaceService.getCurrentWorkspaceId()
+        if (email && workspace) {
+            const profile = await ProfileService.getWorkspaceUserByProfile(workspace)
+
+            if (profile) {
+                    LOG.info("Initialize user: ", profile)
+                    await UserService.setCurrentUser(profile);
+                }
+
+        } else {
+            LOG.info("NOT yet User email: ", email, ' or workspace ', workspace)
+        }
+    }
+
+}
diff --git a/frontend/src/services/UserService.ts b/frontend/src/services/UserService.ts
index a07fb92..d6fa0ed 100644
--- a/frontend/src/services/UserService.ts
+++ b/frontend/src/services/UserService.ts
@@ -6,13 +6,21 @@ import { EmailAuthSessionService } from "../fi/hg/frontend/services/EmailAuthSes
 import { User } from "../fi/hg/dashboard/types/User";
 import { DashboardClient } from "../fi/hg/dashboard/services/DashboardClient";
 import { LogService } from "../fi/hg/core/LogService";
+import {ProfileService} from "./ProfileService";
 
 const LOG = LogService.createLogger('UserService');
 
 export enum UserServiceEvent {
     USER_ADDED = "UserService:itemAdded",
     USER_UPDATED = "UserService:itemUpdated",
-    USER_REMOVED = "UserService:itemRemoved"
+    USER_REMOVED = "UserService:itemRemoved",
+
+/**
+ * Triggered when current user is changed.
+ *
+ * Use `UserService.getWorkspaceId()` to fetch the new ID.
+ */
+     CURRENT_USER_CHANGED = "UserService:currentUserChanged"
 }
 
 export type UserServiceDestructor = ObserverDestructor;
@@ -23,6 +31,11 @@ export class UserService {
 
     public static Event = UserServiceEvent;
 
+    private static _user: User | undefined;
+    public static getCurrentUser (): User | undefined {
+        return this._user;
+    }
+
     public static on(
         name: UserServiceEvent,
         callback: ObserverCallback<UserServiceEvent>
@@ -109,7 +122,33 @@ export class UserService {
 
     }
 
+    /** Check all needed information when initialize profileService, email && workspace*/
+    public static async setCurrentUser (user: User | undefined) {
+
+        if ( user !== this._user ) {
+            LOG.info("setCurrentUser;", user)
+            this._user = user;
+            if ( this._observer.hasCallbacks(UserServiceEvent.CURRENT_USER_CHANGED) ) {
+                if (user){
+                    this._user = user;
+                }else {
+                    LOG.debug(`useSelectWorkspaceUserCallback: Did not find user `);
+                }
+
+                this._observer.triggerEvent(UserServiceEvent.CURRENT_USER_CHANGED);
+            }
+        }
+    }
+
     public static initialize () {
+        LOG.info(`Initializing user`);
+        this._initializeUser().catch((err) => {
+            LOG.error(`ERROR: Could not initialize user: `, err);
+        });
+    }
+
+    public static async _initializeUser () {
+        ProfileService.initialize();
     }
 
 }
diff --git a/frontend/src/services/WorkspaceService.ts b/frontend/src/services/WorkspaceService.ts
index 39c8aa8..2da825b 100644
--- a/frontend/src/services/WorkspaceService.ts
+++ b/frontend/src/services/WorkspaceService.ts
@@ -8,6 +8,7 @@ import { Workspace } from "../fi/hg/dashboard/types/Workspace";
 import { LogService } from "../fi/hg/core/LogService";
 import { RouteService } from "../fi/hg/frontend/services/RouteService";
 import { MY_WORKSPACE_LIST_ROUTE } from "../constants/route";
+import {ProfileService} from "./ProfileService";
 
 export enum WorkspaceServiceEvent {
 
@@ -114,24 +115,21 @@ export class WorkspaceService {
         return await client.getMyWorkspaceList();
     }
 
-    public static setCurrentWorkspace (workspace: Workspace | undefined) {
+    public static async setCurrentWorkspace (workspace: Workspace | undefined) {
         if ( workspace !== this._workspace ) {
+            LOG.info("setCurrentWorkspace;", workspace)
             this._workspace = workspace;
             if ( this._observer.hasCallbacks(WorkspaceServiceEvent.CURRENT_WORKSPACE_CHANGED) ) {
+               await ProfileService.initialize();
+                LOG.info("setCurrentWorkspace;", workspace)
+
                 this._observer.triggerEvent(WorkspaceServiceEvent.CURRENT_WORKSPACE_CHANGED);
             }
         }
     }
 
     private static async _initializeWorkspace () {
-        const list : readonly Workspace[] = await WorkspaceService.getMyWorkspaceList();
-        if ((list?.length ?? 0) !== 1) {
-            LOG.info(`No workspaces; Moving to workspace view`);
-            RouteService.setRoute(MY_WORKSPACE_LIST_ROUTE);
-        } else {
-            LOG.info(`Selecting workspace: `, list[0]);
-            WorkspaceService.setCurrentWorkspace(list[0]);
-        }
+        RouteService.setRoute(MY_WORKSPACE_LIST_ROUTE);
     }
 
 }
diff --git a/testing/src/fi/hg/core b/testing/src/fi/hg/core
index 97c6792..9eec067 160000
--- a/testing/src/fi/hg/core
+++ b/testing/src/fi/hg/core
@@ -1 +1 @@
-Subproject commit 97c67921ae5ded832d9f19a5cc86e1f88a1f0062
+Subproject commit 9eec0676d58a1257f7b0cd038475bd3bbec58c95
diff --git a/testing/src/fi/hg/dashboard b/testing/src/fi/hg/dashboard
index f22aab8..fd071c6 160000
--- a/testing/src/fi/hg/dashboard
+++ b/testing/src/fi/hg/dashboard
@@ -1 +1 @@
-Subproject commit f22aab8506668099848ad835213c491892b84914
+Subproject commit fd071c63929ac3c712b4b1266ceb290f1611b05f
diff --git a/testing/src/fi/hg/node b/testing/src/fi/hg/node
index dadc59d..d970484 160000
--- a/testing/src/fi/hg/node
+++ b/testing/src/fi/hg/node
@@ -1 +1 @@
-Subproject commit dadc59d065a6a4705d98f310b3e54148f021c6ca
+Subproject commit d97048435a77587f69c22661101892aacda35e38