diff --git a/.eslintrc.js b/.eslintrc.js
index be39a82dd..a2bfbdf29 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -28,7 +28,7 @@ module.exports = {
     'object-curly-spacing': ['warn', 'always'],
     'react/jsx-props-no-spreading': 'off',
     'import/prefer-default-export': 'off',
-    'react-hooks/exhaustive-deps': 'off',
+    'react-hooks/exhaustive-deps': 'warn',
     'no-underscore-dangle': ['error', { allow: ['__typename', '_env_'] }],
     'no-param-reassign': [
       'error',
diff --git a/.gitignore b/.gitignore
index d64d59e6f..aa727b817 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,10 @@ package-lock.json
 public/env-config.js
 public/test-env-config.js
 
+# Generated Excel-sheet with translations and it's cache file
+locale_export.xlsx
+~$locale_export.xlsx
+
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
diff --git a/README.md b/README.md
index 394a1352b..c0daadf4b 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,8 @@
 # Haitaton UI
 
+Haitaton is a service owned by the city of Helsinki that supports the management and prediction of the adverse
+effects of projects taking place within the urban area.
+
 ## Requirements
 
 - Node 16.x
@@ -29,7 +32,7 @@ with `scripts/update-runtime-env.ts`, which contains the actual used variables w
 App is not using create-react-app's default `process.env` way to refer of variables
 but `window._env_` object.
 
-### 'yarn e2e'
+### `yarn e2e`
 
 Runs E2E cypress tests
 
@@ -82,7 +85,20 @@ the identification method in the local environment, edit the `.env` -file.
 
 Then either rebuild the docker container or run `yarn update-runtime-env` as discussed above.
 
-All cloud instances use Helsinki AD identification for now.
+In the cloud instances, dev uses Helsinki AD identification while others use Suomi.fi.
+
+## Excel for translations
+
+You can export an Excel-file with current translations. This can then be sent to translators.
+
+1. In the repository root, run the export script with `yarn locales:export`.
+2. The translations are written to `locale_export.xlsx`.
+
+After the translations are added to the Excel file, they can be imported back.
+
+1. Place the translated file inside repository root. It needs to be named `locale_export.xlsx`.
+2. Run the import script: `yarn locales:import`.
+3. The translations in `/src/locales` are updated.
 
 ## API mocking
 
diff --git a/cypress/integration/E2E.spec.ts b/cypress/integration/E2E.spec.ts
index ce16eb681..5687ac30a 100644
--- a/cypress/integration/E2E.spec.ts
+++ b/cypress/integration/E2E.spec.ts
@@ -9,7 +9,6 @@ import {
   HankeDataDraft,
   HankeIndexData,
   HANKE_INDEX_TYPE,
-  HANKE_SUUNNITTELUVAIHE,
 } from '../../src/domain/types/hanke';
 import { createHankeFromUI } from '../utils/formFiller';
 import { validateIndexes } from '../utils/indexValidator';
@@ -68,7 +67,6 @@ const hankeMock: HankeDataDraft = {
   ],
   tyomaaKatuosoite: 'Mannerheimintie 14',
   vaihe: HANKE_VAIHE.SUUNNITTELU,
-  suunnitteluVaihe: HANKE_SUUNNITTELUVAIHE.KATUSUUNNITTELU_TAI_ALUEVARAUS,
   omistajat: [
     {
       id: null, // not used but types require it
@@ -76,7 +74,7 @@ const hankeMock: HankeDataDraft = {
       email: 'harri.hanketest@hankekatu.foo',
       puhelinnumero: '12341234',
       tyyppi: 'YKSITYISHENKILO',
-      ytunnusTaiHetu: 'tunnus',
+      ytunnus: 'tunnus',
     },
   ],
 };
@@ -87,7 +85,8 @@ const hankeMockIndex: Partial<HankeIndexData> = {
     tyyppi: HANKE_INDEX_TYPE.PERUSINDEKSI,
   },
   pyorailyIndeksi: 3,
-  joukkoliikenneIndeksi: 4,
+  raitiovaunuIndeksi: 4,
+  linjaautoIndeksi: 3,
   perusIndeksi: 4.8,
 };
 
diff --git a/cypress/utils/formFiller.ts b/cypress/utils/formFiller.ts
index 10ebd3ff7..49b68006d 100644
--- a/cypress/utils/formFiller.ts
+++ b/cypress/utils/formFiller.ts
@@ -13,15 +13,10 @@ import {
   HANKE_TARINAHAITTA_KEY,
   HANKE_VAIHE,
   HankeDataDraft,
-  HANKE_SUUNNITTELUVAIHE,
   HANKE_VAIHE_KEY,
-  HANKE_SUUNNITTELUVAIHE_KEY,
 } from '../../src/domain/types/hanke';
 
-export const selectHankeVaihe = (
-  vaihe: HANKE_VAIHE_KEY,
-  suunnitteluVaihe?: HANKE_SUUNNITTELUVAIHE_KEY
-) => {
+export const selectHankeVaihe = (vaihe: HANKE_VAIHE_KEY) => {
   cy.get('#vaihe-toggle-button').click();
   switch (vaihe) {
     case HANKE_VAIHE.OHJELMOINTI:
@@ -29,27 +24,6 @@ export const selectHankeVaihe = (
       break;
     case HANKE_VAIHE.SUUNNITTELU:
       cy.get('#vaihe-item-1').click();
-      if (suunnitteluVaihe) {
-        cy.get('#suunnitteluVaihe-toggle-button').click();
-        switch (suunnitteluVaihe) {
-          case HANKE_SUUNNITTELUVAIHE.YLEIS_TAI_HANKE:
-            cy.get('#suunnitteluVaihe-item-0').click();
-            break;
-          case HANKE_SUUNNITTELUVAIHE.KATUSUUNNITTELU_TAI_ALUEVARAUS:
-            cy.get('#suunnitteluVaihe-item-1').click();
-            break;
-          case HANKE_SUUNNITTELUVAIHE.RAKENNUS_TAI_TOTEUTUS:
-            cy.get('#suunnitteluVaihe-item-2').click();
-            break;
-          case HANKE_SUUNNITTELUVAIHE.TYOMAAN_TAI_HANKKEEN_AIKAINEN:
-            cy.get('#suunnitteluVaihe-item-3').click();
-            break;
-          default:
-            break;
-        }
-      } else {
-        throw new Error('Tämä testin vaihe tarvitsee suunnitteluvaiheen');
-      }
       break;
     case HANKE_VAIHE.RAKENTAMINEN:
       cy.get('#vaihe-item-2').click();
@@ -69,10 +43,7 @@ export const fillForm0 = (hankeData: HankeDataDraft) => {
   }
   cy.get('input[data-testid=nimi]').click();
 
-  selectHankeVaihe(
-    hankeData.vaihe,
-    hankeData.suunnitteluVaihe ? hankeData.suunnitteluVaihe : undefined
-  );
+  selectHankeVaihe(hankeData.vaihe);
 
   if (hankeData.onYKTHanke) {
     cy.get('input[data-testid=onYKTHanke]').click();
diff --git a/cypress/utils/indexValidator.ts b/cypress/utils/indexValidator.ts
index efa756462..949b404d6 100644
--- a/cypress/utils/indexValidator.ts
+++ b/cypress/utils/indexValidator.ts
@@ -5,17 +5,18 @@ export const validateIndexes = (hankeIndexData: Partial<HankeIndexData>) => {
   if (hankeIndexData.liikennehaittaIndeksi && hankeIndexData.liikennehaittaIndeksi.indeksi) {
     cy.get('[data-testid=test-liikennehaittaIndeksi]').should('not.be.empty');
     cy.get('[data-testid=test-liikennehaittaIndeksi]').contains(
-      hankeIndexData.liikennehaittaIndeksi.indeksi
+      hankeIndexData.liikennehaittaIndeksi.indeksi,
     );
   }
   if (hankeIndexData.pyorailyIndeksi) {
     cy.get('[data-testid=test-pyorailyIndeksi]').should('not.be.empty');
     cy.get('[data-testid=test-pyorailyIndeksi]').contains(hankeIndexData.pyorailyIndeksi);
   }
-  if (hankeIndexData.joukkoliikenneIndeksi) {
-    cy.get('[data-testid=test-joukkoliikenneIndeksi]').contains(
-      hankeIndexData.joukkoliikenneIndeksi
-    );
+  if (hankeIndexData.raitiovaunuIndeksi) {
+    cy.get('[data-testid=test-raitiovaunuIndeksi]').contains(hankeIndexData.raitiovaunuIndeksi);
+  }
+  if (hankeIndexData.linjaautoIndeksi) {
+    cy.get('[data-testid=test-linjaautoIndeksi]').contains(hankeIndexData.linjaautoIndeksi);
   }
   if (hankeIndexData.perusIndeksi) {
     cy.get('[data-testid=test-ruuhkautumisIndeksi]').contains(hankeIndexData.perusIndeksi);
diff --git a/package.json b/package.json
index d90f051d6..564eaa83e 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "build-and-serve": "yarn run build && yarn run serve",
     "update-runtime-env": "ts-node -P ./scripts/tsconfig.json --files scripts/update-runtime-env.ts",
     "test": "TEST=true yarn run update-runtime-env && DEBUG_PRINT_LIMIT=50000 react-scripts test",
-    "testCI": "CI=true react-scripts test",
+    "testCI": "TEST=true yarn run update-runtime-env && CI=TRUE DEBUG_PRINT_LIMIT=50000 react-scripts test",
     "eject": "react-scripts eject",
     "type-check": "tsc --pretty --noEmit",
     "format": "prettier --write",
@@ -79,7 +79,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-helmet": "^6.1.0",
-    "react-hook-form": "^7.35.0",
+    "react-hook-form": "^7.47.0",
     "react-i18next": "^12.0.0",
     "react-query": "^3.39.2",
     "react-redux": "^8.0.5",
diff --git a/public/helsinki.png b/public/helsinki.png
new file mode 100644
index 000000000..e247c5af8
Binary files /dev/null and b/public/helsinki.png differ
diff --git a/public/mockServiceWorker.js b/public/mockServiceWorker.js
index 8b1525b56..799b96754 100644
--- a/public/mockServiceWorker.js
+++ b/public/mockServiceWorker.js
@@ -120,7 +120,7 @@ self.addEventListener('fetch', function (event) {
         console.warn(
           '[MSW] Successfully emulated a network error for the "%s %s" request.',
           request.method,
-          request.url
+          request.url,
         );
         return;
       }
@@ -131,9 +131,9 @@ self.addEventListener('fetch', function (event) {
 [MSW] Caught an exception from the "%s %s" request (%s). This is probably not a problem with Mock Service Worker. There is likely an additional logging output above.`,
         request.method,
         request.url,
-        `${error.name}: ${error.message}`
+        `${error.name}: ${error.message}`,
       );
-    })
+    }),
   );
 });
 
diff --git a/src/common/components/app/App.tsx b/src/common/components/app/App.tsx
index 05e4a60b7..ba2f0573f 100644
--- a/src/common/components/app/App.tsx
+++ b/src/common/components/app/App.tsx
@@ -10,6 +10,7 @@ import theme from './theme';
 import { GlobalNotificationProvider } from '../globalNotification/GlobalNotificationContext';
 import GlobalNotification from '../globalNotification/GlobalNotification';
 import { FeatureFlagsProvider } from '../featureFlags/FeatureFlagsContext';
+import ScrollToTop from '../scrollToTop/ScrollToTop';
 import './app.scss';
 import '../../../assets/styles/reset.css';
 
@@ -17,6 +18,7 @@ const queryClient = new QueryClient();
 
 const App: React.FC<React.PropsWithChildren<unknown>> = () => (
   <Router>
+    <ScrollToTop />
     <Provider store={store}>
       <QueryClientProvider client={queryClient}>
         <ChakraProvider theme={theme}>
diff --git a/src/common/components/footer/Footer.tsx b/src/common/components/footer/Footer.tsx
index b36c53a4d..058933a29 100644
--- a/src/common/components/footer/Footer.tsx
+++ b/src/common/components/footer/Footer.tsx
@@ -19,7 +19,7 @@ function HaitatonFooter() {
         <Footer.Item as={Link} to={ACCESSIBILITY.path} label={ACCESSIBILITY.label} />
         <Footer.Item as={Link} to={PRIVACY_POLICY.path} label={PRIVACY_POLICY.label} />
       </Footer.Navigation>
-      <Footer.Base copyrightHolder="Helsingin kaupunki" />
+      <Footer.Base copyrightHolder="Helsingin kaupunki, OpenStreetMap contributors" />
     </Footer>
   );
 }
diff --git a/src/common/components/radiobutton/BooleanRadioButton.tsx b/src/common/components/radiobutton/BooleanRadioButton.tsx
index 98cc93e34..478c2be32 100644
--- a/src/common/components/radiobutton/BooleanRadioButton.tsx
+++ b/src/common/components/radiobutton/BooleanRadioButton.tsx
@@ -15,7 +15,7 @@ type Props<T extends FieldValues> = {
  */
 const BooleanRadioButton = <T extends FieldValues>({ name, id, label, value }: Props<T>) => {
   const {
-    field: { onChange, onBlur, value: inputValue },
+    field: { onChange, onBlur, value: inputValue, ref },
   } = useController({ name });
 
   return (
@@ -30,6 +30,7 @@ const BooleanRadioButton = <T extends FieldValues>({ name, id, label, value }: P
       value={value.toString()}
       checked={value === inputValue}
       data-testid={id}
+      ref={ref}
     />
   );
 };
diff --git a/src/common/components/scrollToTop/ScrollToTop.tsx b/src/common/components/scrollToTop/ScrollToTop.tsx
new file mode 100644
index 000000000..679019ff1
--- /dev/null
+++ b/src/common/components/scrollToTop/ScrollToTop.tsx
@@ -0,0 +1,15 @@
+import { useEffect } from 'react';
+import { useLocation } from 'react-router-dom';
+
+/**
+ * Scroll to top of document when URL pathname changes
+ */
+export default function ScrollToTop() {
+  const { pathname } = useLocation();
+
+  useEffect(() => {
+    window.scrollTo(0, 0);
+  }, [pathname]);
+
+  return null;
+}
diff --git a/src/common/components/textArea/TextArea.tsx b/src/common/components/textArea/TextArea.tsx
index fcb9aa79d..338abdc78 100644
--- a/src/common/components/textArea/TextArea.tsx
+++ b/src/common/components/textArea/TextArea.tsx
@@ -36,7 +36,7 @@ const TextArea: React.FC<Props> = ({
       control={control}
       defaultValue=""
       shouldUnregister={shouldUnregister}
-      render={({ field: { onChange, onBlur, value }, fieldState: { error } }) => {
+      render={({ field: { onChange, onBlur, value, ref }, fieldState: { error } }) => {
         return (
           <HdsTextArea
             id={name}
@@ -53,6 +53,7 @@ const TextArea: React.FC<Props> = ({
             required={required}
             disabled={disabled}
             errorText={getInputErrorText(t, error)}
+            ref={ref}
           />
         );
       }}
diff --git a/src/common/components/textInput/TextInput.tsx b/src/common/components/textInput/TextInput.tsx
index 2471c4e01..a33823ec3 100644
--- a/src/common/components/textInput/TextInput.tsx
+++ b/src/common/components/textInput/TextInput.tsx
@@ -9,6 +9,7 @@ import { getInputErrorText } from '../../utils/form';
 type PropTypes = {
   name: string;
   label?: string;
+  maxLength?: number | undefined;
   disabled?: boolean;
   required?: boolean;
   readOnly?: boolean;
@@ -23,6 +24,7 @@ type PropTypes = {
 const TextInput: React.FC<React.PropsWithChildren<PropTypes>> = ({
   name,
   label,
+  maxLength = undefined,
   disabled,
   tooltip,
   required,
@@ -48,6 +50,7 @@ const TextInput: React.FC<React.PropsWithChildren<PropTypes>> = ({
           className={className}
           label={label || t(`hankeForm:labels:${name}`)}
           value={value || ''}
+          maxLength={maxLength}
           helperText={helperText}
           placeholder={placeholder}
           errorText={getInputErrorText(t, error)}
diff --git a/src/common/routes/LocaleRoutes.tsx b/src/common/routes/LocaleRoutes.tsx
index 2a9e5750c..b72f17577 100644
--- a/src/common/routes/LocaleRoutes.tsx
+++ b/src/common/routes/LocaleRoutes.tsx
@@ -22,6 +22,7 @@ import EditJohtoselvitysPage from '../../pages/EditJohtoselvitysPage';
 import NotFoundPage from '../../pages/staticPages/404Page';
 import ManualPage from '../../pages/staticPages/ManualPage';
 import AccessRightsPage from '../../pages/AccessRightsPage';
+import UserIdentify from '../../domain/auth/components/UserIdentify';
 
 const LocaleRoutes = () => {
   const { t } = useTranslation();
@@ -74,6 +75,7 @@ const LocaleRoutes = () => {
       <Route path={t('routes:REFERENCES:path')} element={<ReferencesPage />} />
       <Route path={t('routes:PRIVACY_POLICY:path')} element={<PrivacyPolicyPage />} />
       <Route path={t('routes:MANUAL:path')} element={<ManualPage />} />
+      <Route path={t('routes:IDENTIFY_USER:path')} element={<UserIdentify />} />
       <Route path="*" element={<NotFoundPage />} />
     </Routes>
   );
diff --git a/src/domain/application/applicationView/ApplicationView.test.tsx b/src/domain/application/applicationView/ApplicationView.test.tsx
index f445694a2..4bb709ad0 100644
--- a/src/domain/application/applicationView/ApplicationView.test.tsx
+++ b/src/domain/application/applicationView/ApplicationView.test.tsx
@@ -1,9 +1,11 @@
 import React from 'react';
 import { rest } from 'msw';
-import { render, screen } from '../../../testUtils/render';
+import { render, screen, waitFor } from '../../../testUtils/render';
 import ApplicationViewContainer from './ApplicationViewContainer';
 import { waitForLoadingToFinish } from '../../../testUtils/helperFunctions';
 import { server } from '../../mocks/test-server';
+import { SignedInUser } from '../../hanke/hankeUsers/hankeUser';
+import * as applicationApi from '../utils';
 
 test('Correct information about application should be displayed', async () => {
   render(<ApplicationViewContainer id={4} />);
@@ -56,7 +58,9 @@ test('Should show error notification if loading application fails', async () =>
 test('Should be able to go editing application when editing is possible', async () => {
   const { user } = render(<ApplicationViewContainer id={4} />);
 
-  await waitForLoadingToFinish();
+  await waitFor(() => screen.findByRole('button', { name: 'Muokkaa hakemusta' }), {
+    timeout: 4000,
+  });
   await user.click(screen.getByRole('button', { name: 'Muokkaa hakemusta' }));
 
   expect(window.location.pathname).toBe('/fi/johtoselvityshakemus/4/muokkaa');
@@ -73,8 +77,7 @@ test('Application edit button should not be displayed when editing is not possib
 test('Should be able to cancel application if it is possible', async () => {
   const { user } = render(<ApplicationViewContainer id={4} />);
 
-  await waitForLoadingToFinish();
-
+  await waitFor(() => screen.findByRole('button', { name: 'Peru hakemus' }), { timeout: 4000 });
   await user.click(screen.getByRole('button', { name: 'Peru hakemus' }));
   await user.click(screen.getByRole('button', { name: 'Vahvista' }));
 
@@ -90,3 +93,50 @@ test('Should not be able to cancel application if it has moved to handling in Al
 
   expect(screen.queryByRole('button', { name: 'Peru hakemus' })).not.toBeInTheDocument();
 });
+
+test('Should not show Edit application and Cancel application buttons if user does not have EDIT_APPLICATIONS permission', async () => {
+  server.use(
+    rest.get('/api/hankkeet/:hankeTunnus/whoami', async (req, res, ctx) => {
+      return res(
+        ctx.status(200),
+        ctx.json<SignedInUser>({
+          hankeKayttajaId: '3fa85f64-5717-4562-b3fc-2c963f66afa6',
+          kayttooikeustaso: 'KATSELUOIKEUS',
+          kayttooikeudet: ['VIEW'],
+        }),
+      );
+    }),
+  );
+
+  render(<ApplicationViewContainer id={4} />);
+
+  await waitForLoadingToFinish();
+
+  expect(screen.queryByRole('button', { name: 'Muokkaa hakemusta' })).not.toBeInTheDocument();
+  expect(screen.queryByRole('button', { name: 'Peru hakemus' })).not.toBeInTheDocument();
+});
+
+test('Should not send multiple requests if clicking application cancel confirm button many times', async () => {
+  server.use(
+    rest.delete('/api/hakemukset/:id', async (req, res, ctx) => {
+      return res(ctx.delay(200), ctx.status(200));
+    }),
+  );
+
+  const cancelApplication = jest.spyOn(applicationApi, 'cancelApplication');
+  const { user } = render(<ApplicationViewContainer id={1} />);
+
+  await waitForLoadingToFinish();
+  await waitFor(() => screen.findByRole('button', { name: 'Peru hakemus' }), { timeout: 4000 });
+
+  await user.click(screen.getByRole('button', { name: 'Peru hakemus' }));
+  const confirmCancelButton = screen.getByRole('button', { name: 'Vahvista' });
+  await user.click(confirmCancelButton);
+  await user.click(confirmCancelButton);
+  await user.click(confirmCancelButton);
+  await screen.findByText('Hakemus peruttiin onnistuneesti');
+
+  expect(cancelApplication).toHaveBeenCalledTimes(1);
+
+  cancelApplication.mockRestore();
+});
diff --git a/src/domain/application/applicationView/ApplicationView.tsx b/src/domain/application/applicationView/ApplicationView.tsx
index 2066e6717..542c89730 100644
--- a/src/domain/application/applicationView/ApplicationView.tsx
+++ b/src/domain/application/applicationView/ApplicationView.tsx
@@ -38,6 +38,7 @@ import { ApplicationCancel } from '../components/ApplicationCancel';
 import AttachmentSummary from '../components/AttachmentSummary';
 import useAttachments from '../hooks/useAttachments';
 import FeatureFlags from '../../../common/components/featureFlags/FeatureFlags';
+import UserRightsCheck from '../../hanke/hankeUsers/UserRightsCheck';
 
 type Props = {
   application: Application;
@@ -119,21 +120,25 @@ function ApplicationView({ application, hanke, onEditApplication }: Props) {
 
         <InformationViewHeaderButtons>
           {isPending ? (
-            <Button
-              theme="coat"
-              iconLeft={<IconPen aria-hidden="true" />}
-              onClick={onEditApplication}
-            >
-              {t('hakemus:buttons:editApplication')}
-            </Button>
+            <UserRightsCheck requiredRight="EDIT_APPLICATIONS" hankeTunnus={hanke?.hankeTunnus}>
+              <Button
+                theme="coat"
+                iconLeft={<IconPen aria-hidden="true" />}
+                onClick={onEditApplication}
+              >
+                {t('hakemus:buttons:editApplication')}
+              </Button>
+            </UserRightsCheck>
           ) : null}
           {hanke ? (
-            <ApplicationCancel
-              applicationId={id}
-              alluStatus={alluStatus}
-              hankeTunnus={hanke?.hankeTunnus}
-              buttonIcon={<IconTrash aria-hidden />}
-            />
+            <UserRightsCheck requiredRight="EDIT_APPLICATIONS" hankeTunnus={hanke?.hankeTunnus}>
+              <ApplicationCancel
+                applicationId={id}
+                alluStatus={alluStatus}
+                hankeTunnus={hanke?.hankeTunnus}
+                buttonIcon={<IconTrash aria-hidden />}
+              />
+            </UserRightsCheck>
           ) : null}
         </InformationViewHeaderButtons>
       </InformationViewHeader>
diff --git a/src/domain/application/components/ApplicationCancel.test.tsx b/src/domain/application/components/ApplicationCancel.test.tsx
index 0f76574d0..7b3215d58 100644
--- a/src/domain/application/components/ApplicationCancel.test.tsx
+++ b/src/domain/application/components/ApplicationCancel.test.tsx
@@ -1,8 +1,10 @@
 import React from 'react';
+import { rest } from 'msw';
 import { IconCross } from 'hds-react';
 import { render, screen } from '../../../testUtils/render';
 import { ApplicationCancel } from './ApplicationCancel';
 import mockApplications from '../../mocks/data/hakemukset-data';
+import { server } from '../../mocks/test-server';
 
 test('Cancel application when it has not been saved', async () => {
   const { user } = render(
@@ -11,7 +13,7 @@ test('Cancel application when it has not been saved', async () => {
       alluStatus={null}
       hankeTunnus="HAI22-2"
       buttonIcon={<IconCross />}
-    />
+    />,
   );
 
   await user.click(screen.getByRole('button', { name: 'Peru hakemus' }));
@@ -32,7 +34,7 @@ test('Cancel application when it has been saved, but not sent to Allu', async ()
       alluStatus={application.alluStatus}
       hankeTunnus="HAI22-2"
       buttonIcon={<IconCross />}
-    />
+    />,
   );
 
   await user.click(screen.getByRole('button', { name: 'Peru hakemus' }));
@@ -44,6 +46,29 @@ test('Cancel application when it has been saved, but not sent to Allu', async ()
   expect(screen.queryByText('Hakemus peruttiin onnistuneesti')).toBeInTheDocument();
 });
 
+test('Cancel application when generated hanke is also deleted, directs to hanke list', async () => {
+  server.use(
+    rest.delete('/api/hakemukset/:id', async (req, res, ctx) => {
+      return res(ctx.status(200), ctx.json({ hankeDeleted: true }));
+    }),
+  );
+  const application = mockApplications[0];
+  const { user } = render(
+    <ApplicationCancel
+      applicationId={application.id}
+      alluStatus={application.alluStatus}
+      hankeTunnus="HAI22-2"
+      buttonIcon={<IconCross />}
+    />,
+  );
+
+  await user.click(screen.getByRole('button', { name: 'Peru hakemus' }));
+  await user.click(screen.getByRole('button', { name: 'Vahvista' }));
+
+  expect(window.location.pathname).toBe('/fi/hankesalkku');
+  expect(screen.queryByText('Hakemus peruttiin onnistuneesti')).toBeInTheDocument();
+});
+
 test('Cancel application when it has been saved and sent to Allu but is still pending', async () => {
   const application = mockApplications[1];
 
@@ -53,7 +78,7 @@ test('Cancel application when it has been saved and sent to Allu but is still pe
       alluStatus={application.alluStatus}
       hankeTunnus="HAI22-2"
       buttonIcon={<IconCross />}
-    />
+    />,
   );
 
   await user.click(screen.getByRole('button', { name: 'Peru hakemus' }));
@@ -74,7 +99,7 @@ test('Canceling application is not possible when it in handling in Allu', () =>
       alluStatus={application.alluStatus}
       hankeTunnus="HAI22-2"
       buttonIcon={<IconCross />}
-    />
+    />,
   );
 
   expect(screen.queryByRole('button', { name: 'Peru hakemus' })).not.toBeInTheDocument();
diff --git a/src/domain/application/components/ApplicationCancel.tsx b/src/domain/application/components/ApplicationCancel.tsx
index 257527969..0c7155261 100644
--- a/src/domain/application/components/ApplicationCancel.tsx
+++ b/src/domain/application/components/ApplicationCancel.tsx
@@ -7,7 +7,10 @@ import { AlluStatusStrings } from '../types/application';
 import { isApplicationPending, cancelApplication } from '../utils';
 import ConfirmationDialog from '../../../common/components/HDSConfirmationDialog/ConfirmationDialog';
 import { useGlobalNotification } from '../../../common/components/globalNotification/GlobalNotificationContext';
-import useNavigateToApplicationList from '../../hanke/hooks/useNavigateToApplicationList';
+import {
+  useNavigateToApplicationList,
+  useNavigateToHankeList,
+} from '../../hanke/hooks/useNavigateToApplicationList';
 
 type Props = {
   applicationId: number | null;
@@ -28,6 +31,7 @@ export const ApplicationCancel: React.FC<Props> = ({
 }) => {
   const { t } = useTranslation();
   const navigateToApplicationList = useNavigateToApplicationList(hankeTunnus);
+  const navigateToHankeList = useNavigateToHankeList();
 
   const [isConfirmationDialogOpen, setIsConfirmationDialogOpen] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
@@ -44,7 +48,7 @@ export const ApplicationCancel: React.FC<Props> = ({
       }
       setErrorMessage(message);
     },
-    onSuccess() {
+    onSuccess(data) {
       const closeButtonLabelText = t('common:components:notification:closeButtonLabelText');
       setNotification(true, {
         label: t('hakemus:notifications:cancelSuccessLabel'),
@@ -55,7 +59,7 @@ export const ApplicationCancel: React.FC<Props> = ({
         autoClose: true,
         autoCloseDuration: 7000,
       });
-      navigateToApplicationList();
+      data?.hankeDeleted ? navigateToHankeList() : navigateToApplicationList();
     },
   });
 
@@ -87,6 +91,7 @@ export const ApplicationCancel: React.FC<Props> = ({
         mainBtnLabel={t('common:confirmationDialog:confirmButton')}
         variant="danger"
         errorMsg={errorMessage}
+        isLoading={applicationCancelMutation.isLoading}
       />
 
       <Button
diff --git a/src/domain/application/components/PreFilledContactSelect.tsx b/src/domain/application/components/PreFilledContactSelect.tsx
index 5779a4d53..f472cd627 100644
--- a/src/domain/application/components/PreFilledContactSelect.tsx
+++ b/src/domain/application/components/PreFilledContactSelect.tsx
@@ -24,7 +24,9 @@ const PreFilledContactSelect: React.FC<{
 
   const preFilledContactOptions: PreFilledContactOption[] = allHankeContacts.flatMap(
     (hankeContacts) =>
-      hankeContacts ? hankeContacts.map((contact) => ({ label: contact.nimi, value: contact })) : []
+      hankeContacts
+        ? hankeContacts.map((contact) => ({ label: contact.nimi, value: contact }))
+        : [],
   );
 
   function handlePreFilledContactChange(option: PreFilledContactOption | undefined) {
@@ -43,7 +45,7 @@ const PreFilledContactSelect: React.FC<{
         country: 'FI',
         email: value.email,
         phone: value.puhelinnumero || '',
-        registryKey: (isHankeContact(value) && value.ytunnusTaiHetu) || null,
+        registryKey: (isHankeContact(value) && value.ytunnus) || null,
         ovt: null,
         invoicingOperator: null,
         sapCustomerNumber: null,
diff --git a/src/domain/application/types/application.ts b/src/domain/application/types/application.ts
index 7c3851525..f6ddfc931 100644
--- a/src/domain/application/types/application.ts
+++ b/src/domain/application/types/application.ts
@@ -143,6 +143,10 @@ export interface Application {
   hankeTunnus: string | null;
 }
 
+export interface ApplicationDeletionResult {
+  hankeDeleted: boolean;
+}
+
 export function isCustomerWithContacts(value: unknown): value is CustomerWithContacts {
   return (value as CustomerWithContacts)?.contacts !== undefined;
 }
diff --git a/src/domain/application/utils.ts b/src/domain/application/utils.ts
index d139a51a4..03d2f7b60 100644
--- a/src/domain/application/utils.ts
+++ b/src/domain/application/utils.ts
@@ -1,6 +1,11 @@
 import { TFunction } from 'i18next';
 import api from '../api/api';
-import { AlluStatus, AlluStatusStrings, Application } from './types/application';
+import {
+  AlluStatus,
+  AlluStatusStrings,
+  Application,
+  ApplicationDeletionResult,
+} from './types/application';
 
 /**
  * Save application to Haitaton backend
@@ -47,7 +52,7 @@ export function isApplicationDraft(alluStatus: AlluStatus | null) {
 export async function cancelApplication(applicationId: number | null) {
   if (applicationId === null) return null;
 
-  const response = await api.delete<Application>(`/hakemukset/${applicationId}`);
+  const response = await api.delete<ApplicationDeletionResult>(`/hakemukset/${applicationId}`);
   return response.data;
 }
 
diff --git a/src/domain/auth/components/UserIdentify.test.tsx b/src/domain/auth/components/UserIdentify.test.tsx
new file mode 100644
index 000000000..d5915fe54
--- /dev/null
+++ b/src/domain/auth/components/UserIdentify.test.tsx
@@ -0,0 +1,88 @@
+import React from 'react';
+import { render, screen, waitFor } from '@testing-library/react';
+import { MemoryRouter } from 'react-router-dom';
+import { I18nextProvider } from 'react-i18next';
+import { QueryClient, QueryClientProvider } from 'react-query';
+import { InitialEntry } from '@remix-run/router';
+import { User } from 'oidc-client';
+import { Provider } from 'react-redux';
+import AppRoutes from '../../../common/routes/AppRoutes';
+import { FeatureFlagsProvider } from '../../../common/components/featureFlags/FeatureFlagsContext';
+import { GlobalNotificationProvider } from '../../../common/components/globalNotification/GlobalNotificationContext';
+import GlobalNotification from '../../../common/components/globalNotification/GlobalNotification';
+import { store } from '../../../common/redux/store';
+import i18n from '../../../locales/i18n';
+import authService from '../authService';
+import { REDIRECT_PATH_KEY } from '../../../common/routes/constants';
+import * as hankeUsersApi from '../../hanke/hankeUsers/hankeUsersApi';
+
+afterEach(() => {
+  sessionStorage.clear();
+});
+
+const id = '5ArrqPT6kW97QTK7t7ya9PA2';
+const path = `/fi/kutsu?id=${id}`;
+
+const mockUser: Partial<User> = {
+  id_token: 'fffff-aaaaaa-11111',
+  access_token: '.BnutWVN1x7RSAP5bU2a-tXdVPuof_9pBNd_Ozw',
+  profile: {
+    iss: '',
+    sub: '',
+    aud: '',
+    exp: 0,
+    iat: 0,
+  },
+};
+
+function getWrapper(routerInitialEntries?: InitialEntry[]) {
+  const queryClient = new QueryClient({
+    defaultOptions: {
+      queries: {
+        retryDelay: 0,
+      },
+    },
+  });
+
+  return render(
+    <MemoryRouter initialEntries={routerInitialEntries}>
+      <Provider store={store}>
+        <QueryClientProvider client={queryClient}>
+          <I18nextProvider i18n={i18n}>
+            <FeatureFlagsProvider>
+              <GlobalNotificationProvider>
+                <AppRoutes />
+                <GlobalNotification />
+              </GlobalNotificationProvider>
+            </FeatureFlagsProvider>
+          </I18nextProvider>
+        </QueryClientProvider>
+      </Provider>
+    </MemoryRouter>,
+  );
+}
+
+test('Should save path with query string to session storage and navigate to login when going to invitation route', async () => {
+  const login = jest.spyOn(authService, 'login').mockResolvedValue();
+
+  getWrapper([path]);
+
+  await waitFor(() => expect(login).toHaveBeenCalled());
+  expect(window.sessionStorage.getItem(REDIRECT_PATH_KEY)).toBe(path);
+});
+
+test('Should identify user after login', async () => {
+  sessionStorage.setItem(REDIRECT_PATH_KEY, path);
+  jest.spyOn(authService.userManager, 'getUser').mockResolvedValue(mockUser as User);
+  const identifyUser = jest.spyOn(hankeUsersApi, 'identifyUser');
+
+  getWrapper();
+
+  await waitFor(() => expect(window.document.title).toBe('Haitaton - Etusivu'));
+  expect(identifyUser).toHaveBeenCalledWith(id);
+  expect(
+    screen.queryByText(
+      'Tunnistautuminen onnistui. Sinut on nyt lisätty hankkeelle (Aidasmäentien vesihuollon rakentaminen HAI22-2).',
+    ),
+  ).toBeInTheDocument();
+});
diff --git a/src/domain/auth/components/UserIdentify.tsx b/src/domain/auth/components/UserIdentify.tsx
new file mode 100644
index 000000000..947a67b64
--- /dev/null
+++ b/src/domain/auth/components/UserIdentify.tsx
@@ -0,0 +1,66 @@
+import { useEffect, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useMutation } from 'react-query';
+import { Navigate, useLocation, useSearchParams } from 'react-router-dom';
+import ErrorLoadingText from '../../../common/components/errorLoadingText/ErrorLoadingText';
+import { useGlobalNotification } from '../../../common/components/globalNotification/GlobalNotificationContext';
+import useLocale from '../../../common/hooks/useLocale';
+import { REDIRECT_PATH_KEY } from '../../../common/routes/constants';
+import { identifyUser } from '../../hanke/hankeUsers/hankeUsersApi';
+import useUser from '../useUser';
+
+function UserIdentify() {
+  const { data: user } = useUser();
+  const isAuthenticated = Boolean(user?.profile);
+  const locale = useLocale();
+  const { t } = useTranslation();
+  const location = useLocation();
+  const [searchParams] = useSearchParams();
+  const id = searchParams.get('id');
+  const { setNotification } = useGlobalNotification();
+  const identifyUserCalled = useRef(false);
+
+  const { mutate, isSuccess, isError } = useMutation(identifyUser);
+
+  useEffect(() => {
+    if (!isAuthenticated) {
+      sessionStorage.setItem(REDIRECT_PATH_KEY, `${location.pathname}${location.search}`);
+    }
+  }, [isAuthenticated, location.pathname, location.search]);
+
+  useEffect(() => {
+    if (isAuthenticated && id !== null && !identifyUserCalled.current) {
+      mutate(id, {
+        onSuccess({ hankeNimi, hankeTunnus }) {
+          setNotification(true, {
+            label: t('hankeUsers:notifications:userIdentifiedLabel'),
+            message: t('hankeUsers:notifications:userIdentifiedText', { hankeNimi, hankeTunnus }),
+            type: 'success',
+            dismissible: true,
+            closeButtonLabelText: t('common:components:notification:closeButtonLabelText'),
+          });
+        },
+        onSettled() {
+          identifyUserCalled.current = true;
+          sessionStorage.removeItem(REDIRECT_PATH_KEY);
+        },
+      });
+    }
+  }, [isAuthenticated, id, mutate, setNotification, t]);
+
+  if (isError) {
+    return <ErrorLoadingText>{t('hankeUsers:notifications:userIdentifiedError')}</ErrorLoadingText>;
+  }
+
+  if (!isAuthenticated) {
+    return <Navigate to="/login" />;
+  }
+
+  if (isSuccess) {
+    return <Navigate to={`/${locale}`} />;
+  }
+
+  return null;
+}
+
+export default UserIdentify;
diff --git a/src/domain/forms/MultipageForm.tsx b/src/domain/forms/MultipageForm.tsx
index f66f9c553..23bc0e210 100644
--- a/src/domain/forms/MultipageForm.tsx
+++ b/src/domain/forms/MultipageForm.tsx
@@ -87,6 +87,7 @@ const MultipageForm: React.FC<Props> = ({
 
   function handleStepChange(value: Action) {
     function changeStep() {
+      window.scrollTo(0, 0);
       dispatch(value);
       if (onStepChange) {
         onStepChange();
diff --git a/src/domain/forms/components/Contact.tsx b/src/domain/forms/components/Contact.tsx
index d8e209185..1340e79cb 100644
--- a/src/domain/forms/components/Contact.tsx
+++ b/src/domain/forms/components/Contact.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useCallback, useEffect } from 'react';
 import { Flex } from '@chakra-ui/react';
 import { Button, IconCross, IconPlusCircle, Tab, TabList, TabPanel, Tabs } from 'hds-react';
 import { useTranslation } from 'react-i18next';
@@ -11,6 +11,7 @@ interface Props<T> {
   index?: number;
   onRemoveContact?: UseFieldArrayRemove;
   renderSubContact?: (subContactIndex: number, remove: UseFieldArrayRemove) => JSX.Element;
+  showInitialEmpty?: boolean;
   subContactPath: string;
   emptySubContact: unknown;
   children: React.ReactNode;
@@ -21,6 +22,7 @@ const Contact = <T,>({
   index,
   onRemoveContact,
   renderSubContact,
+  showInitialEmpty = false,
   subContactPath,
   emptySubContact,
   children,
@@ -35,9 +37,15 @@ const Contact = <T,>({
     name: subContactPath,
   });
 
-  function addSubContact() {
+  const addSubContact = useCallback(() => {
     appendSubContact(emptySubContact);
-  }
+  }, [appendSubContact, emptySubContact]);
+
+  useEffect(() => {
+    if (subContactFields.length === 0 && showInitialEmpty) {
+      addSubContact();
+    }
+  }, [subContactFields, showInitialEmpty, addSubContact]);
 
   const renderSubContacts = subContactFields.length > 0 && renderSubContact;
   const { tabRefs } = useSelectableTabs(subContactFields.length, { selectLastTabOnChange: true });
diff --git a/src/domain/forms/utils.ts b/src/domain/forms/utils.ts
index f82a4c1f1..76ef4add5 100644
--- a/src/domain/forms/utils.ts
+++ b/src/domain/forms/utils.ts
@@ -10,7 +10,7 @@ import { ObjectSchema } from 'yup';
 export function changeFormStep<T extends FieldValues>(
   handleStepChange: () => void,
   fieldsToValidate: FieldPath<T>[],
-  trigger: UseFormTrigger<T>
+  trigger: UseFormTrigger<T>,
 ) {
   trigger(fieldsToValidate, { shouldFocus: true }).then((isValid) => {
     if (isValid) {
@@ -23,7 +23,7 @@ export function isPageValid<T extends FieldValues, T2 = T>(
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   schema: ObjectSchema<any>,
   pageFieldPaths: FieldPath<T>[],
-  formValues: T2
+  formValues: T2,
 ): boolean {
   let isValid = true;
   for (let i = 0; i < pageFieldPaths.length; i += 1) {
@@ -37,3 +37,25 @@ export function isPageValid<T extends FieldValues, T2 = T>(
   }
   return isValid;
 }
+
+export function getFieldPaths<T extends FieldValues>(
+  node: object | Array<object> | null,
+  pathToNode: FieldPath<T>,
+): FieldPath<T>[] {
+  if (node === null) {
+    return [];
+  }
+
+  let fieldPaths: string[] = [];
+  if (Array.isArray(node)) {
+    node.forEach((obj, index) => {
+      fieldPaths = fieldPaths.concat(
+        Object.keys(obj).map((key) => `${pathToNode}.${index}.${key}`),
+      );
+    });
+  } else {
+    fieldPaths = Object.keys(node).map((key) => `${pathToNode}.${key}`);
+  }
+
+  return fieldPaths as FieldPath<T>[];
+}
diff --git a/src/domain/hanke/accessRights/AccessRightsView.module.scss b/src/domain/hanke/accessRights/AccessRightsView.module.scss
index ec258f4ad..ea38ce814 100644
--- a/src/domain/hanke/accessRights/AccessRightsView.module.scss
+++ b/src/domain/hanke/accessRights/AccessRightsView.module.scss
@@ -50,18 +50,43 @@
 
 .table > div {
   overflow-x: initial;
+  display: none;
 
-  @include respond-below(m) {
-    display: none;
+  @include respond-above(l) {
+    display: block;
   }
 }
 
 .userCards {
-  @include respond-above(m) {
+  @include respond-above(l) {
     display: none;
   }
 }
 
+.accessRightSelect {
+  min-width: auto;
+
+  @include respond-above(m) {
+    min-width: 250px;
+  }
+
+  @include respond-above(l) {
+    min-width: 345px;
+  }
+}
+
+.invitationSendButtonContainer {
+  min-width: auto;
+
+  @include respond-above(xl) {
+    min-width: 300px;
+  }
+}
+
+.invitationSendButton {
+  vertical-align: middle;
+}
+
 .pagination {
   margin-top: var(--spacing-xs);
   margin-bottom: var(--spacing-s);
diff --git a/src/domain/hanke/accessRights/AccessRightsView.test.tsx b/src/domain/hanke/accessRights/AccessRightsView.test.tsx
index f9c44ddd7..392c85653 100644
--- a/src/domain/hanke/accessRights/AccessRightsView.test.tsx
+++ b/src/domain/hanke/accessRights/AccessRightsView.test.tsx
@@ -6,8 +6,9 @@ import AccessRightsViewContainer from './AccessRightsViewContainer';
 import { server } from '../../mocks/test-server';
 import usersData from '../../mocks/data/users-data.json';
 import { SignedInUser } from '../hankeUsers/hankeUser';
+import * as hankeUsersApi from '../../hanke/hankeUsers/hankeUsersApi';
 
-jest.setTimeout(40000);
+jest.setTimeout(50000);
 
 afterEach(cleanup);
 
@@ -302,3 +303,95 @@ test('Should not be able to remove all rights if user does not have all rights',
 
   expect(screen.getByTestId('kayttooikeustaso-3').querySelector('button')).toBeDisabled();
 });
+
+test('Should show Käyttäjä tunnistautunut text for correct users', async () => {
+  render(<AccessRightsViewContainer hankeTunnus="HAI22-2" />);
+
+  await waitForLoadingToFinish();
+
+  expect(screen.getByTestId('tunnistautunut-0')).toHaveTextContent('Käyttäjä tunnistautunut');
+  expect(screen.getByTestId('tunnistautunut-1')).not.toHaveTextContent('Käyttäjä tunnistautunut');
+  expect(screen.getByTestId('tunnistautunut-2')).toHaveTextContent('Käyttäjä tunnistautunut');
+  expect(screen.getByTestId('tunnistautunut-6')).toHaveTextContent('Käyttäjä tunnistautunut');
+  expect(screen.getByTestId('tunnistautunut-7')).toHaveTextContent('Käyttäjä tunnistautunut');
+  expect(screen.getByTestId('tunnistautunut-8')).toHaveTextContent('Käyttäjä tunnistautunut');
+});
+
+test('Should send invitation to user when cliking the Lähetä kutsulinkki uudelleen button', async () => {
+  const { user } = render(<AccessRightsViewContainer hankeTunnus="HAI22-2" />);
+
+  await waitForLoadingToFinish();
+
+  const invitationButton = screen.getAllByRole('button', {
+    name: 'Lähetä kutsulinkki uudelleen',
+  })[0];
+  await user.click(invitationButton);
+
+  await waitFor(() => {
+    expect(
+      screen.queryByText('Kutsulinkki lähetetty osoitteeseen teppo@test.com.'),
+    ).toBeInTheDocument();
+  });
+  expect(invitationButton).toHaveTextContent('Kutsulinkki lähetetty');
+  expect(invitationButton).toBeDisabled();
+});
+
+test('Should not send multiple requests when clicking the Lähetä kutsulinkki uudelleen button many times', async () => {
+  const sendInvitation = jest.spyOn(hankeUsersApi, 'resendInvitation');
+  const { user } = render(<AccessRightsViewContainer hankeTunnus="HAI22-2" />);
+
+  await waitForLoadingToFinish();
+
+  const invitationButton = screen.getAllByRole('button', {
+    name: 'Lähetä kutsulinkki uudelleen',
+  })[0];
+  await user.click(invitationButton);
+  await user.click(invitationButton);
+  await user.click(invitationButton);
+
+  expect(sendInvitation).toHaveBeenCalledTimes(1);
+
+  sendInvitation.mockRestore();
+});
+
+test('Should show error notification if sending invitation fails', async () => {
+  server.use(
+    rest.post('/api/kayttajat/:kayttajaId/kutsu', async (req, res, ctx) => {
+      return res(ctx.status(500), ctx.json({ errorMessage: 'Failed for testing purposes' }));
+    }),
+  );
+
+  const { user } = render(<AccessRightsViewContainer hankeTunnus="HAI22-2" />);
+
+  await waitForLoadingToFinish();
+
+  const invitationButton = screen.getAllByRole('button', {
+    name: 'Lähetä kutsulinkki uudelleen',
+  })[1];
+  await user.click(invitationButton);
+
+  expect(screen.queryByText('Virhe linkin lähettämisessä')).toBeInTheDocument();
+});
+
+test('Should not show invitation buttons if user does not have permission to send invitation', async () => {
+  server.use(
+    rest.get('/api/hankkeet/:hankeTunnus/whoami', async (req, res, ctx) => {
+      return res(
+        ctx.status(200),
+        ctx.json<SignedInUser>(
+          getSignedInUser({ kayttooikeustaso: 'KATSELUOIKEUS', kayttooikeudet: ['VIEW'] }),
+        ),
+      );
+    }),
+  );
+
+  render(<AccessRightsViewContainer hankeTunnus="HAI22-2" />);
+
+  await waitForLoadingToFinish();
+
+  expect(
+    screen.queryAllByRole('button', {
+      name: 'Lähetä kutsulinkki uudelleen',
+    }),
+  ).toHaveLength(0);
+});
diff --git a/src/domain/hanke/accessRights/AccessRightsView.tsx b/src/domain/hanke/accessRights/AccessRightsView.tsx
index 2e6358c73..a25a653bf 100644
--- a/src/domain/hanke/accessRights/AccessRightsView.tsx
+++ b/src/domain/hanke/accessRights/AccessRightsView.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import {
   Accordion,
   Button,
@@ -10,9 +10,11 @@ import {
   Select,
   Table,
   Link as HDSLink,
+  IconEnvelope,
+  IconCheckCircleFill,
 } from 'hds-react';
 import { cloneDeep } from 'lodash';
-import { Flex } from '@chakra-ui/react';
+import { Box, Flex } from '@chakra-ui/react';
 import { useMutation, useQueryClient } from 'react-query';
 import {
   Column,
@@ -31,7 +33,7 @@ import styles from './AccessRightsView.module.scss';
 import { Language } from '../../../common/types/language';
 import { HankeUser, AccessRightLevel, SignedInUser } from '../hankeUsers/hankeUser';
 import useHankeViewPath from '../hooks/useHankeViewPath';
-import { updateHankeUsers } from '../hankeUsers/hankeUsersApi';
+import { resendInvitation, updateHankeUsers } from '../hankeUsers/hankeUsersApi';
 import Container from '../../../common/components/container/Container';
 import UserCard from './UserCard';
 
@@ -59,6 +61,7 @@ type AccessRightLevelOption = {
 const NAME_KEY = 'nimi';
 const EMAIL_KEY = 'sahkoposti';
 const ACCESS_RIGHT_LEVEL_KEY = 'kayttooikeustaso';
+const USER_IDENTIFIED_KEY = 'tunnistautunut';
 
 function AccessRightsView({ hankeUsers, hankeTunnus, hankeName, signedInUser }: Props) {
   const queryClient = useQueryClient();
@@ -69,7 +72,12 @@ function AccessRightsView({ hankeUsers, hankeTunnus, hankeName, signedInUser }:
   const saveButtonDisabled = modifiedUsers.length === 0;
 
   const columns: Column<HankeUser>[] = useMemo(() => {
-    return [{ accessor: NAME_KEY }, { accessor: EMAIL_KEY }, { accessor: ACCESS_RIGHT_LEVEL_KEY }];
+    return [
+      { accessor: NAME_KEY },
+      { accessor: EMAIL_KEY },
+      { accessor: ACCESS_RIGHT_LEVEL_KEY },
+      { accessor: USER_IDENTIFIED_KEY },
+    ];
   }, []);
 
   const {
@@ -102,6 +110,9 @@ function AccessRightsView({ hankeUsers, hankeTunnus, hankeName, signedInUser }:
   }, [hankeUsers]);
 
   const updateUsersMutation = useMutation(updateHankeUsers);
+  const resendInvitationMutation = useMutation(resendInvitation);
+  // List of user ids for tracking which users have been sent the invitation link
+  const linksSentTo = useRef<string[]>([]);
 
   const [usersSearchValue, setUsersSearchValue] = useState('');
 
@@ -177,10 +188,56 @@ function AccessRightsView({ hankeUsers, hankeTunnus, hankeName, signedInUser }:
           option.value === 'KAIKKI_OIKEUDET' && signedInUser?.kayttooikeustaso !== 'KAIKKI_OIKEUDET'
         }
         disabled={isDisabled}
+        className={styles.accessRightSelect}
       />
     );
   }
 
+  function getInvitationResendButton(args: HankeUser) {
+    if (args.tunnistautunut) {
+      return (
+        <Flex alignItems="baseline">
+          <IconCheckCircleFill
+            color="var(--color-success)"
+            style={{ marginRight: 'var(--spacing-3-xs)', alignSelf: 'center' }}
+            aria-hidden
+          />
+          <p>{t('hankeUsers:userIdentified')}</p>
+        </Flex>
+      );
+    }
+
+    const linkSent = linksSentTo.current.includes(args.id);
+    const buttonText = linkSent
+      ? t('hankeUsers:buttons:invitationSent')
+      : t('hankeUsers:buttons:resendInvitation');
+    const isButtonLoading =
+      resendInvitationMutation.isLoading && resendInvitationMutation.variables === args.id;
+
+    function sendInvitation() {
+      resendInvitationMutation.mutate(args.id, {
+        onSuccess(data) {
+          linksSentTo.current.push(data);
+        },
+      });
+    }
+
+    return (
+      <div className={styles.invitationSendButtonContainer}>
+        <Button
+          variant="secondary"
+          className={styles.invitationSendButton}
+          iconLeft={<IconEnvelope aria-hidden />}
+          onClick={sendInvitation}
+          disabled={linkSent}
+          isLoading={isButtonLoading}
+        >
+          {buttonText}
+        </Button>
+      </div>
+    );
+  }
+
   function updateUsers() {
     const users: Pick<HankeUser, 'id' | 'kayttooikeustaso'>[] = modifiedUsers.map((user) => {
       return {
@@ -218,6 +275,14 @@ function AccessRightsView({ hankeUsers, hankeTunnus, hankeName, signedInUser }:
     },
   ];
 
+  if (signedInUser?.kayttooikeudet.includes('RESEND_INVITATION')) {
+    tableCols.push({
+      headerName: '',
+      key: USER_IDENTIFIED_KEY,
+      transform: getInvitationResendButton,
+    });
+  }
+
   return (
     <article className={styles.container}>
       <header className={styles.header}>
@@ -309,7 +374,10 @@ function AccessRightsView({ hankeUsers, hankeTunnus, hankeName, signedInUser }:
           {page.map((row) => {
             return (
               <UserCard key={row.original.id} user={row.original}>
-                {getAccessRightSelect(row.original)}
+                <Box marginBottom="var(--spacing-s)">{getAccessRightSelect(row.original)}</Box>
+                {signedInUser?.kayttooikeudet.includes('RESEND_INVITATION')
+                  ? getInvitationResendButton(row.original)
+                  : null}
               </UserCard>
             );
           })}
@@ -356,7 +424,7 @@ function AccessRightsView({ hankeUsers, hankeTunnus, hankeName, signedInUser }:
             dismissible
             type="error"
             label={t('hankeUsers:notifications:rightsUpdatedErrorLabel')}
-            closeButtonLabelText={t('hankeUsers:notifications:rightsUpdatedErrorLabel')}
+            closeButtonLabelText={t('common:components:notification:closeButtonLabelText')}
             onClose={() => updateUsersMutation.reset()}
           >
             <Trans i18nKey="hankeUsers:notifications:rightsUpdatedErrorText">
@@ -368,6 +436,42 @@ function AccessRightsView({ hankeUsers, hankeTunnus, hankeName, signedInUser }:
             </Trans>
           </Notification>
         )}
+
+        {resendInvitationMutation.isSuccess && (
+          <Notification
+            position="top-right"
+            dismissible
+            autoClose
+            autoCloseDuration={4000}
+            type="success"
+            label={t('hankeUsers:notifications:invitationSentSuccessLabel')}
+            closeButtonLabelText={t('common:components:notification:closeButtonLabelText')}
+            onClose={() => resendInvitationMutation.reset()}
+          >
+            {t('hankeUsers:notifications:invitationSentSuccessText', {
+              email: hankeUsers.find((user) => user.id === resendInvitationMutation.data)
+                ?.sahkoposti,
+            })}
+          </Notification>
+        )}
+        {resendInvitationMutation.isError && (
+          <Notification
+            position="top-right"
+            dismissible
+            type="error"
+            label={t('hankeUsers:notifications:invitationSentErrorLabel')}
+            closeButtonLabelText={t('common:components:notification:closeButtonLabelText')}
+            onClose={() => resendInvitationMutation.reset()}
+          >
+            <Trans i18nKey="hankeUsers:notifications:invitationSentErrorText">
+              <p>
+                Kutsulinkin lähettämisessä tapahtui virhe. Yritä myöhemmin uudelleen tai ota
+                yhteyttä Haitattoman tekniseen tukeen sähköpostiosoitteessa
+                <HDSLink href="mailto:haitatontuki@hel.fi">haitatontuki@hel.fi</HDSLink>.
+              </p>
+            </Trans>
+          </Notification>
+        )}
       </Container>
     </article>
   );
diff --git a/src/domain/hanke/accessRights/AccessRightsViewContainer.tsx b/src/domain/hanke/accessRights/AccessRightsViewContainer.tsx
index 93bd3450a..cf5c08827 100644
--- a/src/domain/hanke/accessRights/AccessRightsViewContainer.tsx
+++ b/src/domain/hanke/accessRights/AccessRightsViewContainer.tsx
@@ -7,7 +7,7 @@ import ErrorLoadingText from '../../../common/components/errorLoadingText/ErrorL
 import { useHankeUsers } from '../hankeUsers/hooks/useHankeUsers';
 import useHanke from '../hooks/useHanke';
 import AccessRightsView from './AccessRightsView';
-import useSignedInUserRights from '../hankeUsers/hooks/useUserRights';
+import useUserRightsForHanke from '../hankeUsers/hooks/useUserRightsForHanke';
 
 type Props = {
   hankeTunnus: string;
@@ -17,7 +17,7 @@ function AccessRightsViewContainer({ hankeTunnus }: Props) {
   const { t } = useTranslation();
   const { data: hankeUsers, isLoading, isError, error } = useHankeUsers(hankeTunnus);
   const { data: hankeData } = useHanke(hankeTunnus);
-  const { data: signedInUser } = useSignedInUserRights(hankeTunnus);
+  const { data: signedInUser } = useUserRightsForHanke(hankeTunnus);
 
   if (isLoading) {
     return (
diff --git a/src/domain/hanke/edit/HankeForm.test.tsx b/src/domain/hanke/edit/HankeForm.test.tsx
index 043c6b758..3348e53b8 100644
--- a/src/domain/hanke/edit/HankeForm.test.tsx
+++ b/src/domain/hanke/edit/HankeForm.test.tsx
@@ -4,6 +4,7 @@ import HankeForm from './HankeForm';
 import HankeFormContainer from './HankeFormContainer';
 import { HANKE_VAIHE, HANKE_TYOMAATYYPPI } from '../../types/hanke';
 import { render, cleanup, fireEvent, waitFor, screen } from '../../../testUtils/render';
+import hankkeet from '../../mocks/data/hankkeet-data';
 
 afterEach(cleanup);
 
@@ -20,7 +21,6 @@ const hankeData: HankeDataDraft = {
   alkuPvm: '24.03.2025',
   loppuPvm: '25.03.2025',
   vaihe: 'OHJELMOINTI',
-  suunnitteluVaihe: 'KATUSUUNNITTELU_TAI_ALUEVARAUS',
   omistajat: [
     {
       id: null,
@@ -36,6 +36,36 @@ const hankeData: HankeDataDraft = {
 };
 */
 
+function fillBasicInformation(
+  options: {
+    name?: string;
+    description?: string;
+    address?: string;
+    phase?: 'Ohjelmointi' | 'Suunnittelu' | 'Rakentaminen';
+    isYKT?: boolean;
+  } = {},
+) {
+  const {
+    name = nimi,
+    description = hankkeenKuvaus,
+    address = hankkeenOsoite,
+    phase = 'Ohjelmointi',
+    isYKT = false,
+  } = options;
+
+  fireEvent.change(screen.getByLabelText(/hankkeen nimi/i), {
+    target: { value: name },
+  });
+  fireEvent.change(screen.getByLabelText(/hankkeen kuvaus/i), { target: { value: description } });
+  fireEvent.change(screen.getByLabelText(/katuosoite/i), {
+    target: { value: address },
+  });
+  fireEvent.click(screen.getByRole('radio', { name: phase }));
+  if (isYKT) {
+    fireEvent.click(screen.getByRole('checkbox', { name: 'Hanke on YKT-hanke' }));
+  }
+}
+
 const formData: HankeDataFormState = {
   vaihe: HANKE_VAIHE.OHJELMOINTI,
   rakennuttajat: [],
@@ -57,34 +87,6 @@ async function setupYhteystiedotPage(jsx: JSX.Element) {
 }
 
 describe('HankeForm', () => {
-  test('suunnitteluVaihde should be required when vaihe is suunnittelu', async () => {
-    const handleIsDirtyChange = jest.fn();
-    const handleFormClose = jest.fn();
-
-    const { user } = render(
-      <HankeForm
-        formData={formData}
-        onIsDirtyChange={handleIsDirtyChange}
-        onFormClose={handleFormClose}
-      >
-        child
-      </HankeForm>,
-    );
-
-    fireEvent.change(screen.getByTestId(FORMFIELD.NIMI), { target: { value: nimi } });
-    fireEvent.change(screen.getByTestId(FORMFIELD.KUVAUS), { target: { value: hankkeenKuvaus } });
-    fireEvent.change(screen.getByTestId(FORMFIELD.KATUOSOITE), {
-      target: { value: hankkeenOsoite },
-    });
-
-    await user.click(screen.getByRole('radio', { name: 'Suunnittelu' }));
-
-    await user.click(screen.getByRole('checkbox', { name: 'Hanke on YKT-hanke' }));
-
-    await user.click(screen.getByText('Hankkeen suunnitteluvaihe'));
-    await user.click(screen.getByText('Yleis- tai hankesuunnittelu'));
-  });
-
   test('Form should be populated correctly ', () => {
     render(
       <HankeForm
@@ -119,61 +121,113 @@ describe('HankeForm', () => {
     expect(screen.getByTestId(FORMFIELD.KUVAUS)).toHaveValue(hankkeenKuvaus);
   });
 
+  test('Hanke nimi should be limited to 100 characters and not exceed the limit with additional characters', async () => {
+    const { user } = render(<HankeFormContainer />);
+    const initialName = 'b'.repeat(90);
+
+    fireEvent.change(screen.getByRole('textbox', { name: /hankkeen nimi/i }), {
+      target: { value: initialName },
+    });
+
+    await user.type(
+      screen.getByRole('textbox', { name: /hankkeen nimi/i }),
+      'additional_characters',
+    );
+
+    const result = screen.getByRole('textbox', { name: /hankkeen nimi/i });
+    expect(result).toHaveValue(initialName.concat('additional'));
+  });
+
   test('Yhteystiedot can be filled', async () => {
     const { user } = await setupYhteystiedotPage(<HankeFormContainer hankeTunnus="HAI22-1" />);
 
+    // Hanke owner
     await user.click(screen.getByRole('button', { name: /tyyppi/i }));
     await user.click(screen.getByText(/yritys/i));
-    fireEvent.change(screen.getByLabelText(/nimi/i), {
-      target: { value: 'Olli Omistaja' },
+
+    fireEvent.change(screen.getByTestId('omistajat.0.nimi'), {
+      target: { value: 'Omistaja Yritys' },
     });
-    fireEvent.change(screen.getByLabelText(/y-tunnus tai henkilötunnus/i), {
+    fireEvent.change(screen.getByLabelText(/y-tunnus/i), {
       target: { value: 'y-tunnus' },
     });
-    fireEvent.change(screen.getByLabelText(/katuosoite/i), {
-      target: { value: 'Testikuja 1' },
-    });
-    fireEvent.change(screen.getByLabelText(/postinumero/i), {
-      target: { value: '00000' },
-    });
-    fireEvent.change(screen.getByLabelText(/postitoimipaikka/i), {
-      target: { value: 'Testikaupunki' },
-    });
-    fireEvent.change(screen.getByLabelText(/sähköposti/i), {
+    fireEvent.change(screen.getByTestId('omistajat.0.email'), {
       target: { value: 'test@mail.com' },
     });
-    fireEvent.change(screen.getByLabelText(/puhelinnumero/i), {
-      target: { value: '0400000000' },
+    fireEvent.change(screen.getByTestId('omistajat.0.puhelinnumero'), {
+      target: { value: '0401234567' },
     });
 
-    expect(screen.queryByRole('group', { name: 'Yhteyshenkilö' })).not.toBeInTheDocument();
-    await user.click(screen.getByLabelText(/erillinen yhteyshenkilö/i));
-    expect(screen.getByRole('group', { name: 'Yhteyshenkilö' })).toBeInTheDocument();
-
-    fireEvent.change(screen.getAllByLabelText(/nimi/i)[1], {
-      target: { value: 'Testi Yhteyshenkilö' },
+    // Hanke owner contact person
+    fireEvent.change(screen.getByTestId('omistajat.0.alikontaktit.0.etunimi'), {
+      target: { value: 'Olli' },
+    });
+    fireEvent.change(screen.getByTestId('omistajat.0.alikontaktit.0.sukunimi'), {
+      target: { value: 'Omistaja' },
+    });
+    fireEvent.change(screen.getByTestId('omistajat.0.alikontaktit.0.email'), {
+      target: { value: 'foo@bar.com' },
     });
-    fireEvent.change(screen.getAllByLabelText(/sähköposti/i)[1], {
-      target: { value: 'yhteyshenkilo@mail.com' },
+    fireEvent.change(screen.getByTestId('omistajat.0.alikontaktit.0.puhelinnumero'), {
+      target: { value: '0507654321' },
     });
 
-    await user.click(screen.getByText(/Rakennuttajan tiedot/i));
+    // Rakennuttaja
+    await user.click(screen.getByText(/rakennuttajan tiedot/i));
     await user.click(screen.getByText(/lisää rakennuttaja/i));
     expect(screen.getAllByText('Rakennuttaja')).toHaveLength(1);
 
-    await user.click(screen.getByText(/lisää yhteyshenkilö/i));
-    await user.click(screen.getByText(/lisää yhteyshenkilö/i));
-    expect(screen.getByRole('tablist').childElementCount).toBe(2);
+    await user.click(screen.getAllByRole('button', { name: /tyyppi/i })[1]);
+    await user.click(screen.getByText(/yksityishenkilö/i));
+    expect(screen.getAllByLabelText(/y-tunnus/i)[1]).toBeDisabled();
+
+    await user.click(screen.getAllByText(/lisää yhteyshenkilö/i)[1]);
+    await user.click(screen.getAllByText(/lisää yhteyshenkilö/i)[1]);
+    expect(screen.getAllByRole('tablist')[1].childElementCount).toBe(2); // many contacts can be added
+
+    await user.click(screen.getByText(/poista yhteyshenkilö/i));
+    expect(screen.queryByText(/poista yhteyshenkilö/i)).not.toBeInTheDocument(); // cannot remove last one
 
     await user.click(screen.getByText(/lisää rakennuttaja/i));
     expect(screen.getAllByText('Rakennuttaja')).toHaveLength(2);
-
     await user.click(screen.getAllByText(/poista rakennuttaja/i)[1]);
-    expect(screen.getAllByText('Rakennuttaja')).toHaveLength(1);
+    await user.click(screen.getByText(/poista rakennuttaja/i));
 
-    await user.click(screen.getByText(/poista yhteyshenkilö/i));
-    expect(screen.getByRole('tablist').childElementCount).toBe(1);
-    await user.click(screen.getByText(/poista yhteyshenkilö/i));
-    expect(screen.queryByText('Yhteyshenkilön tiedot')).not.toBeInTheDocument();
+    // Check Other types are present and clickable
+    await user.click(screen.getByText(/toteuttajan tiedot/i));
+    await user.click(screen.getByText(/muiden tahojen tiedot/i));
+  });
+
+  test('Should be able to save and quit', async () => {
+    const { user } = render(<HankeFormContainer />);
+
+    fillBasicInformation();
+
+    await user.click(screen.getByRole('button', { name: 'Tallenna ja keskeytä' }));
+
+    expect(window.location.pathname).toBe('/fi/hankesalkku/HAI22-13');
+    expect(screen.getByText(`Hanke ${nimi} (HAI22-13) tallennettu omiin hankkeisiin.`));
+  });
+
+  test('Should be able to save hanke in the last page', async () => {
+    const hanke = hankkeet[1];
+
+    const { user } = render(
+      <HankeForm
+        formData={hanke as HankeDataFormState}
+        onIsDirtyChange={() => ({})}
+        onFormClose={() => ({})}
+      >
+        children
+      </HankeForm>,
+    );
+
+    await user.click(screen.getByRole('button', { name: /yhteenveto/i }));
+    await user.click(screen.getByRole('button', { name: 'Tallenna' }));
+
+    expect(window.location.pathname).toBe(`/fi/hankesalkku/${hanke.hankeTunnus}`);
+    expect(
+      screen.getByText(`Hanke ${hanke.nimi} (${hanke.hankeTunnus}) tallennettu omiin hankkeisiin.`),
+    );
   });
 });
diff --git a/src/domain/hanke/edit/HankeForm.tsx b/src/domain/hanke/edit/HankeForm.tsx
index 0db9e4219..c87ad416f 100644
--- a/src/domain/hanke/edit/HankeForm.tsx
+++ b/src/domain/hanke/edit/HankeForm.tsx
@@ -14,29 +14,18 @@ import HankeFormHaitat from './HankeFormHaitat';
 import HankeFormSummary from './HankeFormSummary';
 import FormNotifications from './components/FormNotifications';
 import './HankeForm.styles.scss';
-import { HankeData, HANKE_SAVETYPE } from '../../types/hanke';
+import { HankeData } from '../../types/hanke';
 import { convertFormStateToHankeData } from './utils';
 import api from '../../api/api';
 import MultipageForm from '../../forms/MultipageForm';
 import FormActions from '../../forms/components/FormActions';
 import { useLocalizedRoutes } from '../../../common/hooks/useLocalizedRoutes';
 import ApplicationAddDialog from '../../application/components/ApplicationAddDialog';
+import { useGlobalNotification } from '../../../common/components/globalNotification/GlobalNotificationContext';
 
-async function saveHanke({
-  data,
-  saveType = HANKE_SAVETYPE.DRAFT,
-}: {
-  data: HankeDataFormState;
-  saveType?: HANKE_SAVETYPE;
-  navigateTo?: string;
-}) {
-  if (!data.alueet?.length) {
-    return data;
-  }
-
+async function saveHanke(data: HankeDataFormState) {
   const requestData = {
     ...convertFormStateToHankeData(data),
-    saveType,
   };
 
   const response = data.hankeTunnus
@@ -62,6 +51,7 @@ const HankeForm: React.FC<React.PropsWithChildren<Props>> = ({
   const { t } = useTranslation();
   const { HANKEPORTFOLIO } = useLocalizedRoutes();
   const navigate = useNavigate();
+  const { setNotification } = useGlobalNotification();
   const [showNotification, setShowNotification] = useState<FormNotification | null>(null);
   const [showAddApplicationDialog, setShowAddApplicationDialog] = useState(false);
   const formContext = useForm<HankeDataFormState>({
@@ -76,15 +66,15 @@ const HankeForm: React.FC<React.PropsWithChildren<Props>> = ({
 
   const {
     register,
-    formState: { errors, isDirty, isValid },
+    formState: { errors, isDirty },
     getValues,
     setValue,
-    handleSubmit,
   } = formContext;
 
   const isNewHanke = !formData.hankeTunnus;
 
   const formValues = getValues();
+  const isHankePublic = formValues.status === 'PUBLIC';
   const formHeading = isNewHanke
     ? t('hankeForm:pageHeaderNew')
     : t('hankeForm:pageHeaderEdit', { hankeTunnus: formData.hankeTunnus });
@@ -96,36 +86,41 @@ const HankeForm: React.FC<React.PropsWithChildren<Props>> = ({
     onError() {
       setShowNotification('error');
     },
-    onSuccess(data, { navigateTo }) {
+    onSuccess(data) {
       setValue('hankeTunnus', data.hankeTunnus);
       setValue('tormaystarkasteluTulos', data.tormaystarkasteluTulos);
-      if (data.alueet) {
-        setShowNotification('success');
-      }
-      if (navigateTo) {
-        navigate(navigateTo);
-      }
+      setValue('status', data.status);
+      setShowNotification('success');
     },
   });
 
-  function saveDraft() {
-    hankeMutation.mutate({ data: getValues() });
-  }
-
-  function saveDraftAndQuit() {
-    hankeMutation.mutate({ data: getValues(), navigateTo: HANKEPORTFOLIO.path });
+  function save() {
+    hankeMutation.mutate(getValues());
   }
 
-  function save() {
-    hankeMutation.mutate({
-      data: getValues(),
-      saveType: HANKE_SAVETYPE.SUBMIT,
-      navigateTo: HANKEPORTFOLIO.path,
+  function saveAndQuit() {
+    hankeMutation.mutate(getValues(), {
+      onSuccess(data) {
+        setNotification(true, {
+          position: 'top-right',
+          dismissible: true,
+          autoClose: true,
+          autoCloseDuration: 8000,
+          label: t('hankeForm:saveAndQuitSuccessHeader'),
+          message: t('hankeForm:saveAndQuitSuccessText', {
+            name: data.nimi,
+            hankeTunnus: data.hankeTunnus,
+          }),
+          type: 'success',
+          closeButtonLabelText: t('common:components:notification:closeButtonLabelText'),
+        });
+        navigate(`${HANKEPORTFOLIO.path}/${data.hankeTunnus}`);
+      },
     });
   }
 
   function saveAndAddApplication() {
-    hankeMutation.mutate({ data: getValues(), saveType: HANKE_SAVETYPE.SUBMIT });
+    save();
     setShowAddApplicationDialog(true);
   }
 
@@ -174,12 +169,7 @@ const HankeForm: React.FC<React.PropsWithChildren<Props>> = ({
         hanke={getValues() as HankeData}
       />
       <div className="hankeForm">
-        <MultipageForm
-          heading={formHeading}
-          formSteps={formSteps}
-          onStepChange={saveDraft}
-          onSubmit={handleSubmit(save)}
-        >
+        <MultipageForm heading={formHeading} formSteps={formSteps} onStepChange={save}>
           {function renderFormActions(activeStepIndex, handlePrevious, handleNext) {
             const lastStep = activeStepIndex === formSteps.length - 1;
             return (
@@ -202,26 +192,31 @@ const HankeForm: React.FC<React.PropsWithChildren<Props>> = ({
                   <Button
                     variant="supplementary"
                     iconLeft={<IconSaveDiskette aria-hidden="true" />}
-                    onClick={saveDraftAndQuit}
+                    onClick={saveAndQuit}
                     data-testid="save-form-btn"
+                    isLoading={hankeMutation.isLoading}
+                    loadingText={t('common:buttons:savingText')}
                   >
                     {t('hankeForm:saveDraftButton')}
                   </Button>
                 )}
                 {lastStep && (
                   <>
-                    <Button
-                      variant="secondary"
-                      iconLeft={<IconPlusCircle aria-hidden />}
-                      onClick={saveAndAddApplication}
-                      disabled={!isValid}
-                    >
-                      {t('hankeForm:saveAndAddButton')}
-                    </Button>
+                    {isHankePublic && (
+                      <Button
+                        variant="secondary"
+                        iconLeft={<IconPlusCircle aria-hidden />}
+                        onClick={saveAndAddApplication}
+                      >
+                        {t('hankeForm:saveAndAddButton')}
+                      </Button>
+                    )}
                     <Button
                       variant="primary"
                       iconLeft={<IconSaveDiskette aria-hidden />}
-                      type="submit"
+                      onClick={saveAndQuit}
+                      isLoading={hankeMutation.isLoading}
+                      loadingText={t('common:buttons:savingText')}
                     >
                       {t('hankeForm:saveButton')}
                     </Button>
diff --git a/src/domain/hanke/edit/HankeFormPerustiedot.tsx b/src/domain/hanke/edit/HankeFormPerustiedot.tsx
index 789f2ae5c..107ec9285 100644
--- a/src/domain/hanke/edit/HankeFormPerustiedot.tsx
+++ b/src/domain/hanke/edit/HankeFormPerustiedot.tsx
@@ -1,12 +1,11 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import { useTranslation, Trans } from 'react-i18next';
 import { Tooltip, TextArea, SelectionGroup, RadioButton } from 'hds-react';
 import { $enum } from 'ts-enum-util';
 import { useFormContext } from 'react-hook-form';
 import { Box } from '@chakra-ui/react';
-import Dropdown from '../../../common/components/dropdown/Dropdown';
 import TextInput from '../../../common/components/textInput/TextInput';
-import { HANKE_VAIHE, HANKE_SUUNNITTELUVAIHE, HANKE_TYOMAATYYPPI } from '../../types/hanke';
+import { HANKE_VAIHE, HANKE_TYOMAATYYPPI } from '../../types/hanke';
 import { FORMFIELD, FormProps } from './types';
 import { useFormPage } from './hooks/useFormPage';
 import DropdownMultiselect from '../../../common/components/dropdown/DropdownMultiselect';
@@ -21,19 +20,13 @@ const HankeFormPerustiedot: React.FC<React.PropsWithChildren<FormProps>> = ({
   formData,
 }) => {
   const { t } = useTranslation();
-  const { watch, setValue } = useFormContext();
+  const { watch } = useFormContext();
   const { JOHTOSELVITYSHAKEMUS } = useLocalizedRoutes();
   useFormPage();
 
-  // Subscribe to vaihe changes
+  // Subscribe to vaihe changes in order to update the selected radio button
   const hankeVaiheField = watch(FORMFIELD.VAIHE);
 
-  useEffect(() => {
-    if (hankeVaiheField !== HANKE_VAIHE.SUUNNITTELU) {
-      setValue(FORMFIELD.SUUNNITTELUVAIHE, null);
-    }
-  }, [hankeVaiheField, setValue]);
-
   return (
     <div className="form0">
       <div className="formInstructions">
@@ -51,7 +44,7 @@ const HankeFormPerustiedot: React.FC<React.PropsWithChildren<FormProps>> = ({
         <p>{t('form:requiredInstruction')}</p>
       </Box>
       <div className="formWpr">
-        <TextInput name={FORMFIELD.NIMI} required />
+        <TextInput name={FORMFIELD.NIMI} maxLength={100} required />
       </div>
       <div className="formWpr">
         <TextArea
@@ -98,21 +91,6 @@ const HankeFormPerustiedot: React.FC<React.PropsWithChildren<FormProps>> = ({
           })}
         </SelectionGroup>
       </div>
-      <div className="formWpr">
-        <Dropdown
-          id={FORMFIELD.SUUNNITTELUVAIHE}
-          name={FORMFIELD.SUUNNITTELUVAIHE}
-          options={$enum(HANKE_SUUNNITTELUVAIHE).map((value) => ({
-            value,
-            label: t(`hanke:suunnitteluVaihe:${value}`),
-          }))}
-          defaultValue={formData[FORMFIELD.SUUNNITTELUVAIHE] || null}
-          label={t(`hankeForm:labels:${FORMFIELD.SUUNNITTELUVAIHE}`)}
-          invalid={!!errors[FORMFIELD.SUUNNITTELUVAIHE]}
-          required={hankeVaiheField === HANKE_VAIHE.SUUNNITTELU}
-          disabled={hankeVaiheField !== HANKE_VAIHE.SUUNNITTELU}
-        />
-      </div>
       <div className="formWpr">
         <DropdownMultiselect
           name={FORMFIELD.TYOMAATYYPPI}
diff --git a/src/domain/hanke/edit/HankeFormYhteystiedot.tsx b/src/domain/hanke/edit/HankeFormYhteystiedot.tsx
index 2c5cdc072..b71d860c4 100644
--- a/src/domain/hanke/edit/HankeFormYhteystiedot.tsx
+++ b/src/domain/hanke/edit/HankeFormYhteystiedot.tsx
@@ -1,9 +1,9 @@
-import React, { useState } from 'react';
+import React, { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { $enum } from 'ts-enum-util';
-import { Accordion, Button, Fieldset, IconCross, IconPlusCircle, ToggleButton } from 'hds-react';
-import { useFieldArray } from 'react-hook-form';
-import { CONTACT_FORMFIELD, FORMFIELD, FormProps } from './types';
+import { Accordion, Button, Fieldset, IconCross, IconPlusCircle } from 'hds-react';
+import { useFieldArray, useFormContext } from 'react-hook-form';
+import { CONTACT_FORMFIELD, FORMFIELD, FormProps, SUBCONTACT_FORMFIELD } from './types';
 import {
   HankeContact,
   CONTACT_TYYPPI,
@@ -24,32 +24,16 @@ import './HankeForm.styles.scss';
 const CONTACT_FIELDS: Array<keyof HankeContact> = [
   'tyyppi',
   'nimi',
-  'ytunnusTaiHetu',
-  'osoite',
-  'postinumero',
-  'postitoimipaikka',
+  'ytunnus',
   'email',
   'puhelinnumero',
 ];
-const REQUIRED_CONTACT_FIELDS: Array<keyof HankeContact> = [
-  'tyyppi',
-  'nimi',
-  'ytunnusTaiHetu',
-  'email',
-];
-
-function isRequiredContactField(field: keyof HankeContact) {
-  return REQUIRED_CONTACT_FIELDS.includes(field);
-}
 
 function getEmptyContact(): Omit<HankeContact, 'id'> {
   return {
     nimi: '',
     tyyppi: null,
-    ytunnusTaiHetu: '',
-    osoite: '',
-    postinumero: '',
-    postitoimipaikka: '',
+    ytunnus: '',
     email: '',
     puhelinnumero: '',
     alikontaktit: [],
@@ -70,19 +54,18 @@ function getEmptyOtherContact(): HankeMuuTaho {
 
 function getEmptySubContact(): HankeSubContact {
   return {
-    nimi: '',
-    osoite: '',
-    postinumero: '',
-    postitoimipaikka: '',
+    etunimi: '',
+    sukunimi: '',
     email: '',
     puhelinnumero: '',
   };
 }
 
-const SubContactFields: React.FC<{ fieldPath: string; onRemove: () => void }> = ({
-  fieldPath,
-  onRemove,
-}) => {
+const SubContactFields: React.FC<{
+  fieldPath: string;
+  canBeRemoved: boolean;
+  onRemove: () => void;
+}> = ({ fieldPath, canBeRemoved, onRemove }) => {
   const { t } = useTranslation();
 
   return (
@@ -93,53 +76,62 @@ const SubContactFields: React.FC<{ fieldPath: string; onRemove: () => void }> =
     >
       <ResponsiveGrid>
         <TextInput
-          name={`${fieldPath}.${CONTACT_FORMFIELD.NIMI}`}
-          label={t(`form:yhteystiedot:labels:${CONTACT_FORMFIELD.NIMI}`)}
+          name={`${fieldPath}.${SUBCONTACT_FORMFIELD.ETUNIMI}`}
+          label={t(`form:yhteystiedot:labels:${SUBCONTACT_FORMFIELD.ETUNIMI}`)}
           required
         />
-      </ResponsiveGrid>
-      <ResponsiveGrid>
-        <TextInput
-          name={`${fieldPath}.${CONTACT_FORMFIELD.OSOITE}`}
-          label={t(`form:yhteystiedot:labels:${CONTACT_FORMFIELD.OSOITE}`)}
-        />
         <TextInput
-          name={`${fieldPath}.${CONTACT_FORMFIELD.POSTINRO}`}
-          label={t(`form:yhteystiedot:labels:${CONTACT_FORMFIELD.POSTINRO}`)}
-        />
-        <TextInput
-          name={`${fieldPath}.${CONTACT_FORMFIELD.POSTITOIMIPAIKKA}`}
-          label={t(`form:yhteystiedot:labels:${CONTACT_FORMFIELD.POSTITOIMIPAIKKA}`)}
+          name={`${fieldPath}.${SUBCONTACT_FORMFIELD.SUKUNIMI}`}
+          label={t(`form:yhteystiedot:labels:${SUBCONTACT_FORMFIELD.SUKUNIMI}`)}
+          required
         />
+      </ResponsiveGrid>
+      <ResponsiveGrid>
         <TextInput
-          name={`${fieldPath}.${CONTACT_FORMFIELD.EMAIL}`}
-          label={t(`form:yhteystiedot:labels:${CONTACT_FORMFIELD.EMAIL}`)}
+          name={`${fieldPath}.${SUBCONTACT_FORMFIELD.EMAIL}`}
+          label={t(`form:yhteystiedot:labels:${SUBCONTACT_FORMFIELD.EMAIL}`)}
           required
         />
         <TextInput
-          name={`${fieldPath}.${CONTACT_FORMFIELD.PUHELINNUMERO}`}
-          label={t(`form:yhteystiedot:labels:${CONTACT_FORMFIELD.PUHELINNUMERO}`)}
+          name={`${fieldPath}.${SUBCONTACT_FORMFIELD.PUHELINNUMERO}`}
+          label={t(`form:yhteystiedot:labels:${SUBCONTACT_FORMFIELD.PUHELINNUMERO}`)}
+          required
         />
-        <Button
-          variant="supplementary"
-          iconLeft={<IconCross aria-hidden />}
-          onClick={onRemove}
-          style={{ alignSelf: 'end' }}
-        >
-          {t(`form:yhteystiedot:buttons:removeSubContact`)}
-        </Button>
+        {canBeRemoved && (
+          <Button
+            variant="supplementary"
+            iconLeft={<IconCross aria-hidden />}
+            onClick={onRemove}
+            style={{ alignSelf: 'end' }}
+          >
+            {t(`form:yhteystiedot:buttons:removeSubContact`)}
+          </Button>
+        )}
       </ResponsiveGrid>
     </Fieldset>
   );
 };
 
-const ContactField: React.FC<{ field: keyof HankeContact; fieldName: string }> = ({
-  field,
-  fieldName,
-}) => {
+const ContactField: React.FC<{
+  field: keyof HankeContact;
+  fieldName: string;
+  contactType: HankeContactTypeKey;
+  index: number;
+}> = ({ field, fieldName, contactType, index }) => {
   const { t } = useTranslation();
+  const { watch, setValue } = useFormContext();
+  const selectedContactType = watch(`${contactType}.${index}.tyyppi`);
+  const inputDisabled =
+    field === CONTACT_FORMFIELD.TUNNUS && selectedContactType === CONTACT_TYYPPI.YKSITYISHENKILO;
+
+  useEffect(() => {
+    if (inputDisabled) {
+      setValue(`${contactType}.${index}.ytunnus`, null, {
+        shouldValidate: true,
+      });
+    }
+  }, [inputDisabled, contactType, index, setValue]);
 
-  const isRequired = isRequiredContactField(field);
   const label = t(`form:yhteystiedot:labels:${field}`);
 
   if (field === 'tyyppi') {
@@ -147,7 +139,6 @@ const ContactField: React.FC<{ field: keyof HankeContact; fieldName: string }> =
       <Dropdown
         id={fieldName}
         name={fieldName}
-        required={isRequired}
         defaultValue={null}
         label={label}
         options={$enum(CONTACT_TYYPPI).map((value) => {
@@ -160,7 +151,7 @@ const ContactField: React.FC<{ field: keyof HankeContact; fieldName: string }> =
     );
   }
 
-  return <TextInput name={fieldName} label={label} required={isRequired} />;
+  return <TextInput name={fieldName} label={label} disabled={inputDisabled} />;
 };
 
 const HankeFormYhteystiedot: React.FC<FormProps> = () => {
@@ -168,8 +159,6 @@ const HankeFormYhteystiedot: React.FC<FormProps> = () => {
   const { t } = useTranslation();
   const locale = useLocale();
 
-  const [separateContact, setSeparateContact] = useState(false);
-
   const {
     fields: rakennuttajat,
     append: appendRakennuttaja,
@@ -184,15 +173,15 @@ const HankeFormYhteystiedot: React.FC<FormProps> = () => {
     remove: removeToteuttaja,
   } = useFieldArray({ name: FORMFIELD.TOTEUTTAJAT });
 
-  const { fields: muutTahot, append: appendMuuTaho, remove: removeMuuTaho } = useFieldArray({
+  const {
+    fields: muutTahot,
+    append: appendMuuTaho,
+    remove: removeMuuTaho,
+  } = useFieldArray({
     name: FORMFIELD.MUUTTAHOT,
   });
 
-  function toggleSeparateContact() {
-    setSeparateContact((separateContactValue) => !separateContactValue);
-  }
-
-  const ownerSubContactFieldPath = `${FORMFIELD.OMISTAJAT}.0.${CONTACT_FORMFIELD.ALIKONTAKTIT}.0`;
+  const ownerSubContactFieldPath = `${FORMFIELD.OMISTAJAT}.0.${CONTACT_FORMFIELD.ALIKONTAKTIT}`;
 
   return (
     <div className="form2">
@@ -202,60 +191,46 @@ const HankeFormYhteystiedot: React.FC<FormProps> = () => {
       <Text tag="h3" styleAs="h3" weight="light" spacingBottom="xs">
         {t(`form:yhteystiedot:titles:omistajaInfo`)}
       </Text>
-      <Fieldset
-        heading={t(`form:yhteystiedot:titles:omistaja`)}
-        style={{ paddingTop: 'var(--spacing-s)' }}
-      >
-        <ResponsiveGrid className="formWpr">
-          {CONTACT_FIELDS.map((contactField) => {
-            const fieldName = `${FORMFIELD.OMISTAJAT}.0.${contactField}`;
-            return <ContactField key={contactField} field={contactField} fieldName={fieldName} />;
-          })}
-        </ResponsiveGrid>
-      </Fieldset>
-      <div className="formWpr">
-        <ToggleButton
-          id="erillinen-yhteyshenkilo"
-          label={t('form:yhteystiedot:labels:erillinenYhteyshenkilo')}
-          onChange={toggleSeparateContact}
-          checked={separateContact}
-        />
-      </div>
-      {separateContact && (
-        <Fieldset heading={t('form:yhteystiedot:titles:subContact')} border className="fieldset">
-          <ResponsiveGrid>
-            <TextInput
-              name={`${ownerSubContactFieldPath}.${CONTACT_FORMFIELD.NIMI}`}
-              label={t(`form:yhteystiedot:labels:${CONTACT_FORMFIELD.NIMI}`)}
-              required
+
+      {/* Omistaja */}
+      <Contact<HankeContactTypeKey>
+        contactType={HANKE_CONTACT_TYPE.OMISTAJAT}
+        subContactPath={ownerSubContactFieldPath}
+        emptySubContact={getEmptySubContact()}
+        showInitialEmpty={true}
+        renderSubContact={(subContactIndex, removeSubContact) => {
+          const fieldPath = `${ownerSubContactFieldPath}.${subContactIndex}`;
+          return (
+            <SubContactFields
+              fieldPath={fieldPath}
+              canBeRemoved={subContactIndex > 0}
+              onRemove={() => removeSubContact(subContactIndex)}
             />
-          </ResponsiveGrid>
+          );
+        }}
+      >
+        <Fieldset
+          heading={t('form:yhteystiedot:titles:omistaja')}
+          style={{ paddingTop: 'var(--spacing-s)' }}
+        >
           <ResponsiveGrid>
-            <TextInput
-              name={`${ownerSubContactFieldPath}.${CONTACT_FORMFIELD.OSOITE}`}
-              label={t(`form:yhteystiedot:labels:${CONTACT_FORMFIELD.OSOITE}`)}
-            />
-            <TextInput
-              name={`${ownerSubContactFieldPath}.${CONTACT_FORMFIELD.POSTINRO}`}
-              label={t(`form:yhteystiedot:labels:${CONTACT_FORMFIELD.POSTINRO}`)}
-            />
-            <TextInput
-              name={`${ownerSubContactFieldPath}.${CONTACT_FORMFIELD.POSTITOIMIPAIKKA}`}
-              label={t(`form:yhteystiedot:labels:${CONTACT_FORMFIELD.POSTITOIMIPAIKKA}`)}
-            />
-            <TextInput
-              name={`${ownerSubContactFieldPath}.${CONTACT_FORMFIELD.EMAIL}`}
-              label={t(`form:yhteystiedot:labels:${CONTACT_FORMFIELD.EMAIL}`)}
-              required
-            />
-            <TextInput
-              name={`${ownerSubContactFieldPath}.${CONTACT_FORMFIELD.PUHELINNUMERO}`}
-              label={t(`form:yhteystiedot:labels:${CONTACT_FORMFIELD.PUHELINNUMERO}`)}
-            />
+            {CONTACT_FIELDS.map((contactField) => {
+              const fieldName = `${FORMFIELD.OMISTAJAT}.0.${contactField}`;
+              return (
+                <ContactField
+                  key={contactField}
+                  field={contactField}
+                  fieldName={fieldName}
+                  contactType={HANKE_CONTACT_TYPE.OMISTAJAT}
+                  index={0}
+                />
+              );
+            })}
           </ResponsiveGrid>
         </Fieldset>
-      )}
+      </Contact>
 
+      {/* Rakennuttaja */}
       <Accordion
         language={locale}
         headingLevel={3}
@@ -275,6 +250,7 @@ const HankeFormYhteystiedot: React.FC<FormProps> = () => {
                 return (
                   <SubContactFields
                     fieldPath={fieldPath}
+                    canBeRemoved={subContactIndex > 0}
                     onRemove={() => removeSubContact(subContactIndex)}
                   />
                 );
@@ -288,7 +264,13 @@ const HankeFormYhteystiedot: React.FC<FormProps> = () => {
                   {CONTACT_FIELDS.map((contactField) => {
                     const fieldName = `${FORMFIELD.RAKENNUTTAJAT}.${index}.${contactField}`;
                     return (
-                      <ContactField key={contactField} field={contactField} fieldName={fieldName} />
+                      <ContactField
+                        key={contactField}
+                        field={contactField}
+                        fieldName={fieldName}
+                        contactType={HANKE_CONTACT_TYPE.RAKENNUTTAJAT}
+                        index={index}
+                      />
                     );
                   })}
                 </ResponsiveGrid>
@@ -306,6 +288,7 @@ const HankeFormYhteystiedot: React.FC<FormProps> = () => {
         </Button>
       </Accordion>
 
+      {/* Toteuttaja */}
       <Accordion
         language={locale}
         headingLevel={3}
@@ -325,6 +308,7 @@ const HankeFormYhteystiedot: React.FC<FormProps> = () => {
                 return (
                   <SubContactFields
                     fieldPath={fieldPath}
+                    canBeRemoved={subContactIndex > 0}
                     onRemove={() => removeSubContact(subContactIndex)}
                   />
                 );
@@ -338,7 +322,13 @@ const HankeFormYhteystiedot: React.FC<FormProps> = () => {
                   {CONTACT_FIELDS.map((contactField) => {
                     const fieldName = `${FORMFIELD.TOTEUTTAJAT}.${index}.${contactField}`;
                     return (
-                      <ContactField key={contactField} field={contactField} fieldName={fieldName} />
+                      <ContactField
+                        key={contactField}
+                        field={contactField}
+                        fieldName={fieldName}
+                        contactType={HANKE_CONTACT_TYPE.TOTEUTTAJAT}
+                        index={index}
+                      />
                     );
                   })}
                 </ResponsiveGrid>
@@ -356,6 +346,7 @@ const HankeFormYhteystiedot: React.FC<FormProps> = () => {
         </Button>
       </Accordion>
 
+      {/* Muut tahot */}
       <Accordion
         language={locale}
         headingLevel={3}
@@ -377,6 +368,7 @@ const HankeFormYhteystiedot: React.FC<FormProps> = () => {
                 return (
                   <SubContactFields
                     fieldPath={subContactFieldPath}
+                    canBeRemoved={subContactIndex > 0}
                     onRemove={() => removeSubContact(subContactIndex)}
                   />
                 );
diff --git a/src/domain/hanke/edit/components/ContactsSummary.tsx b/src/domain/hanke/edit/components/ContactsSummary.tsx
index f5ebb8c9f..1daa87f88 100644
--- a/src/domain/hanke/edit/components/ContactsSummary.tsx
+++ b/src/domain/hanke/edit/components/ContactsSummary.tsx
@@ -11,13 +11,13 @@ const ContactSummary: React.FC<{ contact: HankeContact | HankeMuuTaho }> = ({ co
   if (CONTACT_FORMFIELD.TYYPPI in contact) {
     return (
       <div style={{ marginBottom: 'var(--spacing-s)' }}>
-        <p>{t(`form:yhteystiedot:contactType:${contact.tyyppi}`)}</p>
+        {contact.tyyppi !== undefined && (
+          <p>{t(`form:yhteystiedot:contactType:${contact.tyyppi}`)}</p>
+        )}
         <p>{contact.nimi}</p>
-        <p>{contact.ytunnusTaiHetu}</p>
-        {contact.osoite && <p>{contact.osoite}</p>}
-        <p>
-          {contact.postinumero} {contact.postitoimipaikka}
-        </p>
+        <p>{contact.ytunnus}</p>
+        <p>{contact.email}</p>
+        <p>{contact.puhelinnumero}</p>
       </div>
     );
   }
@@ -33,15 +33,16 @@ const ContactSummary: React.FC<{ contact: HankeContact | HankeMuuTaho }> = ({ co
   );
 };
 
-const SubContactSummary: React.FC<{ contact: HankeSubContact }> = ({ contact }) => {
+const SubContactSummary: React.FC<{ contact: HankeSubContact }> = ({
+  contact: { etunimi, sukunimi, email, puhelinnumero },
+}) => {
   return (
     <div>
-      <p>{contact.nimi}</p>
-      <p>{contact.email}</p>
-      {contact.osoite && <p>{contact.osoite}</p>}
       <p>
-        {contact.postinumero} {contact.postitoimipaikka}
+        {etunimi} {sukunimi}
       </p>
+      <p>{email}</p>
+      <p>{puhelinnumero}</p>
     </div>
   );
 };
diff --git a/src/domain/hanke/edit/components/HankeDraftStateNotification.tsx b/src/domain/hanke/edit/components/HankeDraftStateNotification.tsx
index fc0a83158..5dee9f4e8 100644
--- a/src/domain/hanke/edit/components/HankeDraftStateNotification.tsx
+++ b/src/domain/hanke/edit/components/HankeDraftStateNotification.tsx
@@ -2,7 +2,6 @@ import { Notification } from 'hds-react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { HankeData } from '../../../types/hanke';
-import { useIsHankeValid } from '../hooks/useIsHankeValid';
 
 type Props = {
   /** Hanke data */
@@ -12,28 +11,25 @@ type Props = {
 };
 
 /**
- * Show hanke draft state notification if there are missing required fields in hanke
+ * Show hanke draft state notification if it's status is DRAFT
  */
 const HankeDraftStateNotification: React.FC<Props> = ({ hanke, className }) => {
   const { t } = useTranslation();
 
-  // Check if hanke has all the required fields filled
-  const isHankeValid = useIsHankeValid(hanke);
-
-  if (isHankeValid) {
-    return null;
+  if (hanke.status === 'DRAFT') {
+    return (
+      <Notification
+        size="small"
+        label={t('hankePortfolio:draftStateLabel')}
+        className={className}
+        type="alert"
+      >
+        {t('hankePortfolio:draftState')}
+      </Notification>
+    );
   }
 
-  return (
-    <Notification
-      size="small"
-      label={t('hankePortfolio:draftStateLabel')}
-      className={className}
-      type="alert"
-    >
-      {t('hankePortfolio:draftState')}
-    </Notification>
-  );
+  return null;
 };
 
 export default HankeDraftStateNotification;
diff --git a/src/domain/hanke/edit/hankeSchema.ts b/src/domain/hanke/edit/hankeSchema.ts
index 1f174a2a1..b87d881d0 100644
--- a/src/domain/hanke/edit/hankeSchema.ts
+++ b/src/domain/hanke/edit/hankeSchema.ts
@@ -2,7 +2,6 @@ import { $enum } from 'ts-enum-util';
 import yup from '../../../common/utils/yup';
 import {
   HANKE_VAIHE,
-  HANKE_SUUNNITTELUVAIHE,
   HANKE_MELUHAITTA,
   HANKE_POLYHAITTA,
   HANKE_TARINAHAITTA,
@@ -10,35 +9,43 @@ import {
   HANKE_KAISTAPITUUSHAITTA,
   CONTACT_TYYPPI,
 } from '../../types/hanke';
-import { FORMFIELD, CONTACT_FORMFIELD } from './types';
+import { FORMFIELD, CONTACT_FORMFIELD, SUBCONTACT_FORMFIELD } from './types';
+import isValidBusinessId from '../../../common/utils/isValidBusinessId';
 
 const subContactSchema = yup
   .object()
   .nullable()
   .default(null)
   .shape({
-    [CONTACT_FORMFIELD.NIMI]: yup.string().max(100).required(),
-    [CONTACT_FORMFIELD.OSOITE]: yup.string(),
-    [CONTACT_FORMFIELD.POSTINRO]: yup.string(),
-    [CONTACT_FORMFIELD.POSTITOIMIPAIKKA]: yup.string(),
-    [CONTACT_FORMFIELD.EMAIL]: yup.string().email().max(100).required(),
-    [CONTACT_FORMFIELD.PUHELINNUMERO]: yup.string().nullable().default(null).max(20),
+    [SUBCONTACT_FORMFIELD.SUKUNIMI]: yup.string().max(50).required(),
+    [SUBCONTACT_FORMFIELD.ETUNIMI]: yup.string().max(50).required(),
+    [SUBCONTACT_FORMFIELD.EMAIL]: yup.string().email().max(100).required(),
+    [SUBCONTACT_FORMFIELD.PUHELINNUMERO]: yup.string().nullable().default(null).max(20).required(),
   });
 
-const contactSchema = subContactSchema.shape({
-  [CONTACT_FORMFIELD.TYYPPI]: yup.string().oneOf($enum(CONTACT_TYYPPI).getValues()).required(),
-  [CONTACT_FORMFIELD.TUNNUS]: yup.string().required(),
-  [CONTACT_FORMFIELD.ALIKONTAKTIT]: yup.array().ensure().of(subContactSchema),
-});
+const contactSchema = yup
+  .object()
+  .nullable()
+  .default(null)
+  .shape({
+    [CONTACT_FORMFIELD.NIMI]: yup.string().max(100),
+    [CONTACT_FORMFIELD.TYYPPI]: yup.string().oneOf($enum(CONTACT_TYYPPI).getValues()),
+    [CONTACT_FORMFIELD.TUNNUS]: yup
+      .string()
+      .nullable()
+      .when('tyyppi', {
+        is: (value: string) => value === CONTACT_TYYPPI.YRITYS || value === CONTACT_TYYPPI.YHTEISO,
+        then: (schema) =>
+          schema.test('is-business-id', 'Is not valid business id', isValidBusinessId),
+        otherwise: (schema) => schema,
+      }),
+    [CONTACT_FORMFIELD.EMAIL]: yup.string().email().max(100),
+    [CONTACT_FORMFIELD.PUHELINNUMERO]: yup.string().nullable().default(null).max(20),
+    [CONTACT_FORMFIELD.ALIKONTAKTIT]: yup.array().ensure().of(subContactSchema),
+  });
 
 const otherPartySchema = contactSchema
-  .omit([
-    CONTACT_FORMFIELD.TYYPPI,
-    CONTACT_FORMFIELD.TUNNUS,
-    CONTACT_FORMFIELD.OSOITE,
-    CONTACT_FORMFIELD.POSTINRO,
-    CONTACT_FORMFIELD.POSTITOIMIPAIKKA,
-  ])
+  .omit([CONTACT_FORMFIELD.TYYPPI, CONTACT_FORMFIELD.TUNNUS])
   .shape({
     [CONTACT_FORMFIELD.ROOLI]: yup.string().required(),
     [CONTACT_FORMFIELD.ORGANISAATIO]: yup.string(),
@@ -73,13 +80,6 @@ export const hankeSchema = yup.object().shape({
   [FORMFIELD.KUVAUS]: yup.string().required().min(1),
   [FORMFIELD.KATUOSOITE]: yup.string().required(),
   [FORMFIELD.VAIHE]: yup.mixed().oneOf($enum(HANKE_VAIHE).getValues()).required(),
-  [FORMFIELD.SUUNNITTELUVAIHE]: yup
-    .mixed()
-    .nullable()
-    .when([FORMFIELD.VAIHE], {
-      is: HANKE_VAIHE.SUUNNITTELU,
-      then: yup.mixed().oneOf($enum(HANKE_SUUNNITTELUVAIHE).getValues()).required(),
-    }),
   [FORMFIELD.HANKEALUEET]: yup.array().ensure().of(hankeAlueSchema),
   [FORMFIELD.OMISTAJAT]: yup.array().length(1).ensure().of(contactSchema),
   [FORMFIELD.RAKENNUTTAJAT]: yup.array().ensure().of(contactSchema),
diff --git a/src/domain/hanke/edit/types.ts b/src/domain/hanke/edit/types.ts
index a33bb23ec..6374c9b92 100644
--- a/src/domain/hanke/edit/types.ts
+++ b/src/domain/hanke/edit/types.ts
@@ -12,7 +12,6 @@ export enum FORMFIELD {
   NIMI = 'nimi',
   KUVAUS = 'kuvaus',
   KATUOSOITE = 'tyomaaKatuosoite',
-  SUUNNITTELUVAIHE = 'suunnitteluVaihe',
   TYOMAATYYPPI = 'tyomaaTyyppi',
   HAITTA_ALKU_PVM = 'haittaAlkuPvm',
   HAITTA_LOPPU_PVM = 'haittaLoppuPvm',
@@ -36,10 +35,7 @@ export enum CONTACT_FORMFIELD {
   TYYPPI = 'tyyppi',
   ROOLI = 'rooli',
   NIMI = 'nimi',
-  TUNNUS = 'ytunnusTaiHetu',
-  OSOITE = 'osoite',
-  POSTINRO = 'postinumero',
-  POSTITOIMIPAIKKA = 'postitoimipaikka',
+  TUNNUS = 'ytunnus',
   EMAIL = 'email',
   PUHELINNUMERO = 'puhelinnumero',
   ORGANISAATIO = 'organisaatioNimi',
@@ -47,6 +43,14 @@ export enum CONTACT_FORMFIELD {
   ALIKONTAKTIT = 'alikontaktit',
 }
 
+export enum SUBCONTACT_FORMFIELD {
+  ID = 'id',
+  ETUNIMI = 'etunimi',
+  SUKUNIMI = 'sukunimi',
+  EMAIL = 'email',
+  PUHELINNUMERO = 'puhelinnumero',
+}
+
 export interface HankeAlueFormState extends HankeAlue {
   feature?: Feature<Geometry>; // "virtualField"
 }
diff --git a/src/domain/hanke/hankeIndexes/HankeIndexes.test.tsx b/src/domain/hanke/hankeIndexes/HankeIndexes.test.tsx
index 14d8834a9..8426cdd16 100644
--- a/src/domain/hanke/hankeIndexes/HankeIndexes.test.tsx
+++ b/src/domain/hanke/hankeIndexes/HankeIndexes.test.tsx
@@ -14,17 +14,21 @@ describe('HankeSidebar', () => {
     expect(findByText('Pyöräilyn pääreitti')).toBeTruthy();
     expect(getByTestId('test-pyorailyIndeksi')).toHaveTextContent('3');
     expect(getByTestId('test-pyorailyIndeksi-content')).toHaveTextContent(
-      'Kiertoreittitarve: todennäköinen'
+      'Kiertoreittitarve: todennäköinen',
     );
     expect(findByText('Merkittävät joukkoliikennereitit')).toBeTruthy();
-    expect(getByTestId('test-joukkoliikenneIndeksi')).toHaveTextContent('1');
-    expect(getByTestId('test-joukkoliikenneIndeksi-content')).toHaveTextContent(
-      'Kiertoreittitarve: ei tarvetta'
+    expect(getByTestId('test-raitiovaunuIndeksi')).toHaveTextContent('1');
+    expect(getByTestId('test-raitiovaunuIndeksi-content')).toHaveTextContent(
+      'Kiertoreittitarve: ei tarvetta',
+    );
+    expect(getByTestId('test-linjaautoIndeksi')).toHaveTextContent('2');
+    expect(getByTestId('test-linjaautoIndeksi-content')).toHaveTextContent(
+      'Kiertoreittitarve: ei tarvetta',
     );
     expect(findByText('Ruuhkautuminen')).toBeTruthy();
     expect(getByTestId('test-ruuhkautumisIndeksi')).toHaveTextContent('4');
     expect(getByTestId('test-ruuhkautumisIndeksi-content')).toHaveTextContent(
-      'Kiertoreittitarve: merkittävä'
+      'Kiertoreittitarve: merkittävä',
     );
   });
 });
diff --git a/src/domain/hanke/hankeIndexes/HankeIndexes.tsx b/src/domain/hanke/hankeIndexes/HankeIndexes.tsx
index b86fce829..8d9dde12b 100644
--- a/src/domain/hanke/hankeIndexes/HankeIndexes.tsx
+++ b/src/domain/hanke/hankeIndexes/HankeIndexes.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { LoadingSpinner, Tooltip } from 'hds-react';
@@ -95,7 +94,8 @@ const HankeIndexes: React.FC<React.PropsWithChildren<Props>> = ({
   const hankeIndexTitle = indexTitle || t('hankeIndexes:haittaindeksit');
   const liikennehaittaIndeksi = hankeIndexData?.liikennehaittaIndeksi.indeksi;
   const pyorailyIndeksi = hankeIndexData?.pyorailyIndeksi;
-  const joukkoliikenneIndeksi = hankeIndexData?.joukkoliikenneIndeksi;
+  const raitiovaunuIndeksi = hankeIndexData?.raitiovaunuIndeksi;
+  const linjaautoIndeksi = hankeIndexData?.linjaautoIndeksi;
   const perusIndeksi = hankeIndexData?.perusIndeksi;
 
   return (
@@ -123,7 +123,7 @@ const HankeIndexes: React.FC<React.PropsWithChildren<Props>> = ({
         <IndexSection
           title={t('hankeIndexes:pyorailynPaareitti')}
           content={`${t('hankeIndexes:kiertoreittitarve')}: ${t(
-            getDetourNeedByIndex(pyorailyIndeksi)
+            getDetourNeedByIndex(pyorailyIndeksi),
           )}`}
           index={pyorailyIndeksi}
           testId="test-pyorailyIndeksi"
@@ -132,12 +132,23 @@ const HankeIndexes: React.FC<React.PropsWithChildren<Props>> = ({
         />
 
         <IndexSection
-          title={t('hankeIndexes:merkittavatJoukkoliikennereitit')}
+          title={t('hankeIndexes:joukkoliikenneRaitiovaunu')}
           content={`${t('hankeIndexes:kiertoreittitarve')}: ${t(
-            getDetourNeedByIndex(joukkoliikenneIndeksi)
+            getDetourNeedByIndex(raitiovaunuIndeksi),
           )}`}
-          index={joukkoliikenneIndeksi}
-          testId="test-joukkoliikenneIndeksi"
+          index={raitiovaunuIndeksi}
+          testId="test-raitiovaunuIndeksi"
+          loading={loading}
+          showIndexText={!small}
+        />
+
+        <IndexSection
+          title={t('hankeIndexes:joukkoliikenneLinjaauto')}
+          content={`${t('hankeIndexes:kiertoreittitarve')}: ${t(
+            getDetourNeedByIndex(linjaautoIndeksi),
+          )}`}
+          index={linjaautoIndeksi}
+          testId="test-linjaautoIndeksi"
           loading={loading}
           showIndexText={!small}
         />
@@ -145,7 +156,7 @@ const HankeIndexes: React.FC<React.PropsWithChildren<Props>> = ({
         <IndexSection
           title={t('hankeIndexes:ruuhkautuminen')}
           content={`${t('hankeIndexes:kiertoreittitarve')}: ${t(
-            getDetourNeedByIndex(perusIndeksi)
+            getDetourNeedByIndex(perusIndeksi),
           )}`}
           index={perusIndeksi}
           testId="test-ruuhkautumisIndeksi"
diff --git a/src/domain/hanke/hankeUsers/UserRightsCheck.test.tsx b/src/domain/hanke/hankeUsers/UserRightsCheck.test.tsx
new file mode 100644
index 000000000..b2a5f8b1c
--- /dev/null
+++ b/src/domain/hanke/hankeUsers/UserRightsCheck.test.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import { rest } from 'msw';
+import { render, screen, waitFor } from '../../../testUtils/render';
+import { server } from '../../mocks/test-server';
+import { SignedInUser } from './hankeUser';
+import UserRightsCheck from './UserRightsCheck';
+
+test('Should render children if user has required right', async () => {
+  render(
+    <UserRightsCheck requiredRight="EDIT" hankeTunnus="HAI22-2">
+      <p>Children</p>
+    </UserRightsCheck>,
+  );
+
+  await waitFor(() => {
+    expect(screen.getByText('Children')).toBeInTheDocument();
+  });
+});
+
+test('Should not render children if user does not have required right', async () => {
+  server.use(
+    rest.get('/api/hankkeet/:hankeTunnus/whoami', async (req, res, ctx) => {
+      return res(
+        ctx.status(200),
+        ctx.json<SignedInUser>({
+          hankeKayttajaId: '3fa85f64-5717-4562-b3fc-2c963f66afa6',
+          kayttooikeustaso: 'KATSELUOIKEUS',
+          kayttooikeudet: ['VIEW'],
+        }),
+      );
+    }),
+  );
+
+  render(
+    <UserRightsCheck requiredRight="EDIT" hankeTunnus="HAI22-2">
+      <p>Children</p>
+    </UserRightsCheck>,
+  );
+
+  await waitFor(() => {
+    expect(screen.queryByText('Children')).not.toBeInTheDocument();
+  });
+});
diff --git a/src/domain/hanke/hankeUsers/UserRightsCheck.tsx b/src/domain/hanke/hankeUsers/UserRightsCheck.tsx
new file mode 100644
index 000000000..0db403f75
--- /dev/null
+++ b/src/domain/hanke/hankeUsers/UserRightsCheck.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import useUserRightsForHanke from './hooks/useUserRightsForHanke';
+import { Rights } from './hankeUser';
+
+/**
+ * Check that user has required rights.
+ * If they have, render children.
+ */
+function UserRightsCheck({
+  requiredRight,
+  hankeTunnus,
+  children,
+}: {
+  /** User right that is required to render children */
+  requiredRight: keyof typeof Rights;
+  /** hankeTunnus of the hanke that the right is required for */
+  hankeTunnus?: string;
+  children: React.ReactElement | null;
+}) {
+  const { data: signedInUser } = useUserRightsForHanke(hankeTunnus);
+
+  if (signedInUser?.kayttooikeudet.includes(requiredRight)) {
+    return children;
+  }
+
+  return null;
+}
+
+export default UserRightsCheck;
diff --git a/src/domain/hanke/hankeUsers/hankeUser.ts b/src/domain/hanke/hankeUsers/hankeUser.ts
index 75d4f7866..fd18b105f 100644
--- a/src/domain/hanke/hankeUsers/hankeUser.ts
+++ b/src/domain/hanke/hankeUsers/hankeUser.ts
@@ -14,19 +14,28 @@ export type HankeUser = {
   tunnistautunut: boolean;
 };
 
-export type UserRights = Array<
-  | 'VIEW'
-  | 'MODIFY_VIEW_PERMISSIONS'
-  | 'EDIT'
-  | 'MODIFY_EDIT_PERMISSIONS'
-  | 'DELETE'
-  | 'MODIFY_DELETE_PERMISSIONS'
-  | 'EDIT_APPLICATIONS'
-  | 'MODIFY_APPLICATION_PERMISSIONS'
->;
+export enum Rights {
+  VIEW = 'VIEW',
+  MODIFY_VIEW_PERMISSIONS = 'MODIFY_VIEW_PERMISSIONS',
+  EDIT = 'EDIT',
+  MODIFY_EDIT_PERMISSIONS = 'MODIFY_EDIT_PERMISSIONS',
+  DELETE = 'DELETE',
+  MODIFY_DELETE_PERMISSIONS = 'MODIFY_DELETE_PERMISSIONS',
+  EDIT_APPLICATIONS = 'EDIT_APPLICATIONS',
+  MODIFY_APPLICATION_PERMISSIONS = 'MODIFY_APPLICATION_PERMISSIONS',
+  RESEND_INVITATION = 'RESEND_INVITATION',
+}
+
+export type UserRights = Array<keyof typeof Rights>;
 
 export type SignedInUser = {
   hankeKayttajaId: string;
   kayttooikeustaso: keyof typeof AccessRightLevel;
   kayttooikeudet: UserRights;
 };
+
+export type IdentificationResponse = {
+  kayttajaId: string;
+  hankeTunnus: string;
+  hankeNimi: string;
+};
diff --git a/src/domain/hanke/hankeUsers/hankeUsersApi.ts b/src/domain/hanke/hankeUsers/hankeUsersApi.ts
index 0d962df4e..5ae8bd20c 100644
--- a/src/domain/hanke/hankeUsers/hankeUsersApi.ts
+++ b/src/domain/hanke/hankeUsers/hankeUsersApi.ts
@@ -1,5 +1,5 @@
 import api from '../../api/api';
-import { HankeUser, SignedInUser } from './hankeUser';
+import { HankeUser, IdentificationResponse, SignedInUser } from './hankeUser';
 
 export async function getHankeUsers(hankeTunnus: string) {
   const { data } = await api.get<{ kayttajat: HankeUser[] }>(`hankkeet/${hankeTunnus}/kayttajat`);
@@ -17,8 +17,18 @@ export async function updateHankeUsers({
   return data;
 }
 
-// Get user id and rights of the signed in user
-export async function getSignedInUser(hankeTunnus?: string): Promise<SignedInUser> {
+// Get user id and rights of the signed in user for a hanke
+export async function getSignedInUserForHanke(hankeTunnus?: string): Promise<SignedInUser> {
   const { data } = await api.get<SignedInUser>(`hankkeet/${hankeTunnus}/whoami`);
   return data;
 }
+
+export async function identifyUser(id: string) {
+  const { data } = await api.post<IdentificationResponse>('kayttajat', { tunniste: id });
+  return data;
+}
+
+export async function resendInvitation(kayttajaId: string) {
+  await api.post(`kayttajat/${kayttajaId}/kutsu`);
+  return kayttajaId;
+}
diff --git a/src/domain/hanke/hankeUsers/hooks/useUserRights.ts b/src/domain/hanke/hankeUsers/hooks/useUserRights.ts
deleted file mode 100644
index 929a9a9b7..000000000
--- a/src/domain/hanke/hankeUsers/hooks/useUserRights.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { useQuery } from 'react-query';
-import { SignedInUser } from './../hankeUser';
-import { getSignedInUser } from '../hankeUsersApi';
-
-export default function useSignedInUserRights(hankeTunnus?: string) {
-  return useQuery<SignedInUser>(['signedInUser', hankeTunnus], () => getSignedInUser(hankeTunnus), {
-    enabled: Boolean(hankeTunnus),
-  });
-}
diff --git a/src/domain/hanke/hankeUsers/hooks/useUserRightsForHanke.ts b/src/domain/hanke/hankeUsers/hooks/useUserRightsForHanke.ts
new file mode 100644
index 000000000..a883f8407
--- /dev/null
+++ b/src/domain/hanke/hankeUsers/hooks/useUserRightsForHanke.ts
@@ -0,0 +1,16 @@
+import { useQuery } from 'react-query';
+import { SignedInUser } from '../hankeUser';
+import { getSignedInUserForHanke } from '../hankeUsersApi';
+import { useFeatureFlags } from '../../../../common/components/featureFlags/FeatureFlagsContext';
+
+export default function useSignedInUserRightsForHanke(hankeTunnus?: string) {
+  const features = useFeatureFlags();
+
+  return useQuery<SignedInUser>(
+    ['signedInUser', hankeTunnus],
+    () => getSignedInUserForHanke(hankeTunnus),
+    {
+      enabled: Boolean(hankeTunnus) && features.accessRights,
+    },
+  );
+}
diff --git a/src/domain/hanke/hankeView/HankeView.test.tsx b/src/domain/hanke/hankeView/HankeView.test.tsx
index 0700cfe39..1c5e0d2a2 100644
--- a/src/domain/hanke/hankeView/HankeView.test.tsx
+++ b/src/domain/hanke/hankeView/HankeView.test.tsx
@@ -4,6 +4,22 @@ import { render, screen } from '../../../testUtils/render';
 import { waitForLoadingToFinish } from '../../../testUtils/helperFunctions';
 import HankeViewContainer from './HankeViewContainer';
 import { server } from '../../mocks/test-server';
+import { SignedInUser } from '../hankeUsers/hankeUser';
+
+function getViewPermissionForUser() {
+  server.use(
+    rest.get('/api/hankkeet/:hankeTunnus/whoami', async (req, res, ctx) => {
+      return res(
+        ctx.status(200),
+        ctx.json<SignedInUser>({
+          hankeKayttajaId: '3fa85f64-5717-4562-b3fc-2c963f66afa6',
+          kayttooikeustaso: 'KATSELUOIKEUS',
+          kayttooikeudet: ['VIEW'],
+        }),
+      );
+    }),
+  );
+}
 
 test('Draft state notification is rendered when hanke is in draft state', async () => {
   render(<HankeViewContainer hankeTunnus="HAI22-1" />);
@@ -15,13 +31,20 @@ test('Draft state notification is rendered when hanke is in draft state', async
   expect(draftStateElements[0]).toBeInTheDocument();
 });
 
-test('Add application and End hanke buttons are disabled when hanke is in draft state', async () => {
+test('Add application button is displayed when hanke is in PUBLIC state', async () => {
+  render(<HankeViewContainer hankeTunnus="HAI22-2" />);
+
+  await waitForLoadingToFinish();
+
+  expect(screen.queryByRole('button', { name: /lisää hakemus/i })).toBeInTheDocument();
+});
+
+test('Add application button is hidden when hanke is not in PUBLIC state', async () => {
   render(<HankeViewContainer hankeTunnus="HAI22-1" />);
 
   await waitForLoadingToFinish();
 
-  expect(screen.getByRole('button', { name: /lisää hakemus/i })).toBeDisabled();
-  expect(screen.getByRole('button', { name: /päätä hanke/i })).toBeDisabled();
+  expect(screen.queryByRole('button', { name: /lisää hakemus/i })).not.toBeInTheDocument();
 });
 
 test('Draft state notification is not rendered when hanke is not in draft state', async () => {
@@ -67,7 +90,8 @@ test('Correct information about hanke should be displayed', async () => {
   expect(screen.getAllByText('2.1.2023–24.2.2023').length).toBe(2);
   expect(screen.getByTestId('test-liikennehaittaIndeksi')).toHaveTextContent('3');
   expect(screen.getByTestId('test-pyorailyIndeksi')).toHaveTextContent('3.5');
-  expect(screen.getByTestId('test-joukkoliikenneIndeksi')).toHaveTextContent('2');
+  expect(screen.getByTestId('test-raitiovaunuIndeksi')).toHaveTextContent('2');
+  expect(screen.getByTestId('test-linjaautoIndeksi')).toHaveTextContent('1');
   expect(screen.getByTestId('test-ruuhkautumisIndeksi')).toHaveTextContent('1.5');
   expect(screen.queryByText('11974 m²')).toBeInTheDocument();
   expect(screen.queryByText('Meluhaitta: Satunnainen haitta')).toBeInTheDocument();
@@ -82,9 +106,9 @@ test('Correct information about hanke should be displayed', async () => {
   // Data in contacts tab
   expect(screen.queryByText('Yritys')).toBeInTheDocument();
   expect(screen.queryByText('Kauppisen maansiirtofirma KY')).toBeInTheDocument();
-  expect(screen.queryByText('y-1234567')).toBeInTheDocument();
-  expect(screen.queryByText('Lahdenkatu 3')).toBeInTheDocument();
-  expect(screen.queryByText('42100 Lahti')).toBeInTheDocument();
+  expect(screen.queryByText('5341034-5')).toBeInTheDocument();
+  expect(screen.queryByText('toimisto@testi.com')).toBeInTheDocument();
+  expect(screen.queryByText('0501234567')).toBeInTheDocument();
 });
 
 test('It is possible to delete hanke if it has no active applications', async () => {
@@ -168,3 +192,31 @@ test('Should navigate to application view when clicking the eye icon', async ()
   expect(window.location.pathname).toBe('/fi/hakemus/2');
   expect(screen.queryByText('Mannerheimintien kuopat')).toBeInTheDocument();
 });
+
+test('Should not show edit hanke button if user does not have EDIT permission', async () => {
+  getViewPermissionForUser();
+  render(<HankeViewContainer hankeTunnus="HAI22-2" />);
+
+  await waitForLoadingToFinish();
+
+  expect(screen.queryByRole('button', { name: 'Muokkaa hanketta' })).not.toBeInTheDocument();
+});
+
+test('Should not show add application button if user does not have EDIT_APPLICATIONS permission', async () => {
+  getViewPermissionForUser();
+  render(<HankeViewContainer hankeTunnus="HAI22-2" />);
+
+  await waitForLoadingToFinish();
+
+  expect(screen.queryByRole('button', { name: 'Lisää hakemus' })).not.toBeInTheDocument();
+});
+
+test('Should not show end hanke and remove hanke buttons if user does not have DELETE permission', async () => {
+  getViewPermissionForUser();
+  render(<HankeViewContainer hankeTunnus="HAI22-2" />);
+
+  await waitForLoadingToFinish();
+
+  expect(screen.queryByRole('button', { name: 'Päätä hanke' })).not.toBeInTheDocument();
+  expect(screen.queryByRole('button', { name: 'Peru hanke' })).not.toBeInTheDocument();
+});
diff --git a/src/domain/hanke/hankeView/HankeView.tsx b/src/domain/hanke/hankeView/HankeView.tsx
index 6e1af6c87..743266378 100644
--- a/src/domain/hanke/hankeView/HankeView.tsx
+++ b/src/domain/hanke/hankeView/HankeView.tsx
@@ -37,7 +37,6 @@ import OwnHankeMap from '../../map/components/OwnHankeMap/OwnHankeMap';
 import OwnHankeMapHeader from '../../map/components/OwnHankeMap/OwnHankeMapHeader';
 import CompressedAreaIndex from '../hankeIndexes/CompressedAreaIndex';
 import HankeDraftStateNotification from '../edit/components/HankeDraftStateNotification';
-import { useIsHankeValid } from '../edit/hooks/useIsHankeValid';
 import { SKIP_TO_ELEMENT_ID } from '../../../common/constants/constants';
 import { useApplicationsForHanke } from '../../application/hooks/useApplications';
 import ApplicationList from '../../application/components/ApplicationList';
@@ -53,6 +52,7 @@ import {
 import FeatureFlags from '../../../common/components/featureFlags/FeatureFlags';
 import { useFeatureFlags } from '../../../common/components/featureFlags/FeatureFlagsContext';
 import { SignedInUser } from '../hankeUsers/hankeUser';
+import UserRightsCheck from '../hankeUsers/UserRightsCheck';
 
 type AreaProps = {
   area: HankeAlue;
@@ -159,7 +159,6 @@ const HankeView: React.FC<Props> = ({
     setShowAddApplicationDialog(false);
   }
 
-  const isHankeValid = useIsHankeValid(hankeData);
   const isCancelPossible = applicationsResponse
     ? canHankeBeCancelled(applicationsResponse.applications)
     : true;
@@ -174,7 +173,9 @@ const HankeView: React.FC<Props> = ({
 
   const areasTotalSurfaceArea = calculateTotalSurfaceArea(hankeData.alueet);
 
-  const { omistajat, rakennuttajat, toteuttajat, muut, tormaystarkasteluTulos, alueet } = hankeData;
+  const { omistajat, rakennuttajat, toteuttajat, muut, tormaystarkasteluTulos, alueet, status } =
+    hankeData;
+  const isHankePublic = status === 'PUBLIC';
 
   const tabList = features.hanke ? (
     <TabList className={styles.tabList}>
@@ -216,23 +217,28 @@ const HankeView: React.FC<Props> = ({
 
         <InformationViewHeaderButtons>
           <FeatureFlags flags={['hanke']}>
-            <Button
-              onClick={onEditHanke}
-              variant="primary"
-              iconLeft={<IconPen aria-hidden="true" />}
-              theme="coat"
-            >
-              {t('hankeList:buttons:edit')}
-            </Button>
-            <Button
-              variant="primary"
-              iconLeft={<IconPlusCircle aria-hidden="true" />}
-              theme="coat"
-              onClick={addApplication}
-              disabled={!isHankeValid}
-            >
-              {t('hankeList:buttons:addApplication')}
-            </Button>
+            <UserRightsCheck requiredRight="EDIT" hankeTunnus={hankeData.hankeTunnus}>
+              <Button
+                onClick={onEditHanke}
+                variant="primary"
+                iconLeft={<IconPen aria-hidden="true" />}
+                theme="coat"
+              >
+                {t('hankeList:buttons:edit')}
+              </Button>
+            </UserRightsCheck>
+            <UserRightsCheck requiredRight="EDIT_APPLICATIONS" hankeTunnus={hankeData.hankeTunnus}>
+              {isHankePublic ? (
+                <Button
+                  variant="primary"
+                  iconLeft={<IconPlusCircle aria-hidden="true" />}
+                  theme="coat"
+                  onClick={addApplication}
+                >
+                  {t('hankeList:buttons:addApplication')}
+                </Button>
+              ) : null}
+            </UserRightsCheck>
           </FeatureFlags>
           <FeatureFlags flags={['hanke', 'accessRights']}>
             <Button
@@ -245,23 +251,22 @@ const HankeView: React.FC<Props> = ({
             </Button>
           </FeatureFlags>
           <FeatureFlags flags={['hanke']}>
-            <Button
-              variant="primary"
-              iconLeft={<IconCross aria-hidden="true" />}
-              theme="black"
-              disabled={!isHankeValid}
-            >
-              {t('hankeList:buttons:endHanke')}
-            </Button>
+            <UserRightsCheck requiredRight="DELETE" hankeTunnus={hankeData.hankeTunnus}>
+              <Button variant="primary" iconLeft={<IconCross aria-hidden="true" />} theme="black">
+                {t('hankeList:buttons:endHanke')}
+              </Button>
+            </UserRightsCheck>
           </FeatureFlags>
           {!isLoading && isCancelPossible && (
-            <Button
-              onClick={onCancelHanke}
-              variant="danger"
-              iconLeft={<IconTrash aria-hidden="true" />}
-            >
-              {t('hankeForm:cancelButton')}
-            </Button>
+            <UserRightsCheck requiredRight="DELETE" hankeTunnus={hankeData.hankeTunnus}>
+              <Button
+                onClick={onCancelHanke}
+                variant="danger"
+                iconLeft={<IconTrash aria-hidden="true" />}
+              >
+                {t('hankeForm:cancelButton')}
+              </Button>
+            </UserRightsCheck>
           )}
         </InformationViewHeaderButtons>
       </InformationViewHeader>
diff --git a/src/domain/hanke/hankeView/HankeViewContainer.tsx b/src/domain/hanke/hankeView/HankeViewContainer.tsx
index 0951ab630..1f1346ec5 100644
--- a/src/domain/hanke/hankeView/HankeViewContainer.tsx
+++ b/src/domain/hanke/hankeView/HankeViewContainer.tsx
@@ -5,7 +5,7 @@ import { ROUTES } from '../../../common/types/route';
 import HankeDelete from '../edit/components/HankeDelete';
 import useHanke from '../hooks/useHanke';
 import HankeView from './HankeView';
-import useSignedInUserRights from '../hankeUsers/hooks/useUserRights';
+import useUserRightsForHanke from '../hankeUsers/hooks/useUserRightsForHanke';
 
 type Props = {
   hankeTunnus?: string;
@@ -13,7 +13,7 @@ type Props = {
 
 const HankeViewContainer: React.FC<Props> = ({ hankeTunnus }) => {
   const { data: hankeData } = useHanke(hankeTunnus);
-  const { data: signedInUser } = useSignedInUserRights(hankeTunnus);
+  const { data: signedInUser } = useUserRightsForHanke(hankeTunnus);
   const getEditHankePath = useLinkPath(ROUTES.EDIT_HANKE);
   const getEditRightsPath = useLinkPath(ROUTES.ACCESS_RIGHTS);
   const navigate = useNavigate();
diff --git a/src/domain/hanke/hooks/useNavigateToApplicationList.ts b/src/domain/hanke/hooks/useNavigateToApplicationList.ts
index 6992940f3..3500f0b3f 100644
--- a/src/domain/hanke/hooks/useNavigateToApplicationList.ts
+++ b/src/domain/hanke/hooks/useNavigateToApplicationList.ts
@@ -7,7 +7,7 @@ import { ROUTES } from '../../../common/types/route';
  * Returns a function to navigate to hanke view with application list tab initially open.
  * If there is no hankeTunnus, returned function navigates to hanke portfolio as a fallback.
  */
-export default function useNavigateToApplicationList(hankeTunnus?: string) {
+function useNavigateToApplicationList(hankeTunnus?: string) {
   const navigate = useNavigate();
   const getHankeViewPath = useLinkPath(ROUTES.HANKE);
   const { HANKEPORTFOLIO } = useLocalizedRoutes();
@@ -23,3 +23,15 @@ export default function useNavigateToApplicationList(hankeTunnus?: string) {
 
   return navigateToApplicationList;
 }
+
+function useNavigateToHankeList() {
+  const navigate = useNavigate();
+  const { HANKEPORTFOLIO } = useLocalizedRoutes();
+  function navigateToHankeList() {
+    navigate(HANKEPORTFOLIO.path);
+  }
+
+  return navigateToHankeList;
+}
+
+export { useNavigateToApplicationList, useNavigateToHankeList };
diff --git a/src/domain/hanke/portfolio/HankePortfolio.test.tsx b/src/domain/hanke/portfolio/HankePortfolio.test.tsx
index 11628bc3f..9afaab508 100644
--- a/src/domain/hanke/portfolio/HankePortfolio.test.tsx
+++ b/src/domain/hanke/portfolio/HankePortfolio.test.tsx
@@ -12,7 +12,7 @@ const endDateLabel = 'Ajanjakson loppu';
 
 afterEach(cleanup);
 
-jest.setTimeout(20000);
+jest.setTimeout(30000);
 
 describe.only('HankePortfolio', () => {
   test('Changing search text filters correct number of projects', async () => {
@@ -30,7 +30,7 @@ describe.only('HankePortfolio', () => {
     });
     expect(screen.getByTestId('numberOfFilteredRows')).toHaveTextContent('0');
     expect(
-      screen.queryByText('Valitsemillasi hakuehdoilla ei löytynyt yhtään hanketta')
+      screen.queryByText('Valitsemillasi hakuehdoilla ei löytynyt yhtään hanketta'),
     ).toBeInTheDocument();
 
     await user.click(screen.getByRole('button', { name: /tyhjennä hakuehdot/i }));
@@ -50,7 +50,7 @@ describe.only('HankePortfolio', () => {
     changeFilterDate(startDateLabel, renderedComponent, '11.10.2022');
     expect(renderedComponent.getByTestId('numberOfFilteredRows')).toHaveTextContent('0');
     expect(
-      screen.queryByText('Valitsemillasi hakuehdoilla ei löytynyt yhtään hanketta')
+      screen.queryByText('Valitsemillasi hakuehdoilla ei löytynyt yhtään hanketta'),
     ).toBeInTheDocument();
     changeFilterDate(startDateLabel, renderedComponent, null);
   });
@@ -61,7 +61,7 @@ describe.only('HankePortfolio', () => {
     changeFilterDate(endDateLabel, renderedComponent, '01.10.2022');
     expect(renderedComponent.getByTestId('numberOfFilteredRows')).toHaveTextContent('0');
     expect(
-      screen.queryByText('Valitsemillasi hakuehdoilla ei löytynyt yhtään hanketta')
+      screen.queryByText('Valitsemillasi hakuehdoilla ei löytynyt yhtään hanketta'),
     ).toBeInTheDocument();
     changeFilterDate(endDateLabel, renderedComponent, '05.10.2022');
     expect(renderedComponent.getByTestId('numberOfFilteredRows')).toHaveTextContent('2');
@@ -75,22 +75,22 @@ describe.only('HankePortfolio', () => {
     const renderedComponent = render(<HankePortfolioComponent hankkeet={hankeList} />);
     expect(renderedComponent.getByTestId('numberOfFilteredRows')).toHaveTextContent('2');
     await renderedComponent.user.click(
-      renderedComponent.getByRole('button', { name: 'Työn tyyppi' })
+      renderedComponent.getByRole('button', { name: 'Työn tyyppi' }),
     );
     await renderedComponent.user.click(renderedComponent.getByText('Sähkö'));
     renderedComponent.getByText('Hankevaiheet').click();
     expect(renderedComponent.getByTestId('numberOfFilteredRows')).toHaveTextContent('0');
     expect(
-      screen.queryByText('Valitsemillasi hakuehdoilla ei löytynyt yhtään hanketta')
+      screen.queryByText('Valitsemillasi hakuehdoilla ei löytynyt yhtään hanketta'),
     ).toBeInTheDocument();
     await renderedComponent.user.click(
-      renderedComponent.getByRole('button', { name: 'Työn tyyppi' })
+      renderedComponent.getByRole('button', { name: 'Työn tyyppi' }),
     );
     await renderedComponent.user.click(renderedComponent.getByText('Viemäri'));
     renderedComponent.getByText('Hankevaiheet').click();
     expect(renderedComponent.getByTestId('numberOfFilteredRows')).toHaveTextContent('1');
     await renderedComponent.user.click(
-      renderedComponent.getByRole('button', { name: 'Työn tyyppi' })
+      renderedComponent.getByRole('button', { name: 'Työn tyyppi' }),
     );
     await renderedComponent.user.click(renderedComponent.getByText('Sadevesi'));
     renderedComponent.getByText('Hankevaiheet').click();
@@ -102,4 +102,22 @@ describe.only('HankePortfolio', () => {
 
     expect(screen.queryByText('Hankesalkussasi ei ole hankkeita')).toBeInTheDocument();
   });
+
+  test('Should render edit hanke links for hankkeet that user has edit rights', async () => {
+    render(<HankePortfolioComponent hankkeet={hankeList} />);
+
+    await waitFor(() => {
+      expect(screen.queryAllByTestId('hankeEditLink')).toHaveLength(1);
+    });
+  });
+
+  test('Should show draft state notification for hankkeet that are in draft state', async () => {
+    render(<HankePortfolioComponent hankkeet={hankeList} />);
+
+    expect(
+      screen.getAllByText(
+        'Hanke on luonnostilassa. Alueiden haittatiedot ja muut pakolliset tiedot on täytettävä hankkeen julkaisemiseksi ja lupien lisäämiseksi.',
+      ),
+    ).toHaveLength(1);
+  });
 });
diff --git a/src/domain/hanke/portfolio/HankePortfolioComponent.tsx b/src/domain/hanke/portfolio/HankePortfolioComponent.tsx
index 2f795f84b..c16c344d7 100644
--- a/src/domain/hanke/portfolio/HankePortfolioComponent.tsx
+++ b/src/domain/hanke/portfolio/HankePortfolioComponent.tsx
@@ -37,8 +37,9 @@ import HankeDraftStateNotification from '../edit/components/HankeDraftStateNotif
 import Container from '../../../common/components/container/Container';
 import { SKIP_TO_ELEMENT_ID } from '../../../common/constants/constants';
 import useHankeViewPath from '../hooks/useHankeViewPath';
-import useNavigateToApplicationList from '../hooks/useNavigateToApplicationList';
+import { useNavigateToApplicationList } from '../hooks/useNavigateToApplicationList';
 import FeatureFlags from '../../../common/components/featureFlags/FeatureFlags';
+import UserRightsCheck from '../hankeUsers/UserRightsCheck';
 
 type CustomAccordionProps = {
   hanke: HankeData;
@@ -114,17 +115,19 @@ const CustomAccordion: React.FC<React.PropsWithChildren<CustomAccordionProps>> =
               <IconEye aria-hidden />
             </Link>
             <FeatureFlags flags={['hanke']}>
-              <Link
-                to={getEditHankePath({ hankeTunnus: hanke.hankeTunnus })}
-                aria-label={
-                  // eslint-disable-next-line
-                  t(`routes:${ROUTES.EDIT_HANKE}.meta.title`) +
-                  ` ${hanke.nimi} - ${hanke.hankeTunnus} `
-                }
-                data-testid="hankeEditLink"
-              >
-                <IconPen aria-hidden />
-              </Link>
+              <UserRightsCheck requiredRight="EDIT" hankeTunnus={hanke.hankeTunnus}>
+                <Link
+                  to={getEditHankePath({ hankeTunnus: hanke.hankeTunnus })}
+                  aria-label={
+                    // eslint-disable-next-line
+                    t(`routes:${ROUTES.EDIT_HANKE}.meta.title`) +
+                    ` ${hanke.nimi} - ${hanke.hankeTunnus} `
+                  }
+                  data-testid="hankeEditLink"
+                >
+                  <IconPen aria-hidden />
+                </Link>
+              </UserRightsCheck>
             </FeatureFlags>
           </div>
           <button type="button" className={styles.iconWrapper}>
@@ -250,7 +253,7 @@ const PaginatedPortfolio: React.FC<React.PropsWithChildren<PagedRowsProps>> = ({
     if (value.length === 0) return tyyppiRows;
     return tyyppiRows.filter((hanke) => {
       const includedTyypit = hanke.values.tyomaaTyyppi.filter((tyyppi: string) =>
-        value.includes(tyyppi)
+        value.includes(tyyppi),
       );
       return includedTyypit.length > 0;
     });
@@ -264,7 +267,7 @@ const PaginatedPortfolio: React.FC<React.PropsWithChildren<PagedRowsProps>> = ({
             hankeIsBetweenDates({ startDate: dateStart, endDate: hankeFilterEndDate })({
               startDate: hanke.values.alkuPvm,
               endDate: hanke.values.loppuPvm,
-            })
+            }),
           );
         }
         return dateStartRows.filter((hanke) => dateStart <= hanke.values.loppuPvm);
@@ -279,7 +282,7 @@ const PaginatedPortfolio: React.FC<React.PropsWithChildren<PagedRowsProps>> = ({
             hankeIsBetweenDates({ startDate: hankeFilterStartDate, endDate: dateEnd })({
               startDate: hanke.values.alkuPvm,
               endDate: hanke.values.loppuPvm,
-            })
+            }),
           );
         }
         return dateEndRows.filter((hanke) => hanke.values.alkuPvm <= dateEnd);
@@ -352,7 +355,7 @@ const PaginatedPortfolio: React.FC<React.PropsWithChildren<PagedRowsProps>> = ({
     useFilters,
     useGlobalFilter,
     useSortBy,
-    usePagination
+    usePagination,
   );
 
   const { t, i18n } = useTranslation();
diff --git a/src/domain/johtoselvitys/Contacts.test.tsx b/src/domain/johtoselvitys/Contacts.test.tsx
index 0b6484cd5..4e14e3b82 100644
--- a/src/domain/johtoselvitys/Contacts.test.tsx
+++ b/src/domain/johtoselvitys/Contacts.test.tsx
@@ -39,9 +39,7 @@ test('Contacts can be filled with hanke contact info', async () => {
 
   expect(screen.getAllByRole('button', { name: /tyyppi/i })[0]).toHaveTextContent('Yritys');
   expect(screen.getAllByRole('textbox', { name: /nimi/i })[0]).toHaveValue(hankeOwner.nimi);
-  expect(screen.getAllByRole('textbox', { name: /Y-tunnus/i })[0]).toHaveValue(
-    hankeOwner.ytunnusTaiHetu,
-  );
+  expect(screen.getAllByRole('textbox', { name: /Y-tunnus/i })[0]).toHaveValue(hankeOwner.ytunnus);
   expect(screen.getAllByRole('textbox', { name: /sähköposti/i })[0]).toHaveValue(hankeOwner.email);
   expect(screen.getAllByRole('textbox', { name: /puhelinnumero/i })[0]).toHaveValue(
     hankeOwner.puhelinnumero,
diff --git a/src/domain/johtoselvitys/Contacts.tsx b/src/domain/johtoselvitys/Contacts.tsx
index 5d2e9f0c8..ee2ca0a27 100644
--- a/src/domain/johtoselvitys/Contacts.tsx
+++ b/src/domain/johtoselvitys/Contacts.tsx
@@ -209,10 +209,14 @@ const ContactFields: React.FC<{
 
   function fillWithOrdererInformation() {
     if (ordererInformation !== undefined) {
-      setValue(`applicationData.${customerType}.contacts.${index}`, {
-        ...ordererInformation,
-        orderer: false,
-      });
+      setValue(
+        `applicationData.${customerType}.contacts.${index}`,
+        {
+          ...ordererInformation,
+          orderer: false,
+        },
+        { shouldValidate: true, shouldDirty: true },
+      );
     }
   }
 
diff --git a/src/domain/johtoselvitys/JohtoselvitysContainer.tsx b/src/domain/johtoselvitys/JohtoselvitysContainer.tsx
index 8855d61cb..7883019ba 100644
--- a/src/domain/johtoselvitys/JohtoselvitysContainer.tsx
+++ b/src/domain/johtoselvitys/JohtoselvitysContainer.tsx
@@ -22,12 +22,12 @@ import {
   convertFormStateToApplicationData,
   findOrdererKey,
 } from './utils';
-import { changeFormStep, isPageValid } from '../forms/utils';
+import { changeFormStep, getFieldPaths, isPageValid } from '../forms/utils';
 import { isApplicationDraft, saveApplication, sendApplication } from '../application/utils';
 import { HankeContacts, HankeData } from '../types/hanke';
 import { ApplicationCancel } from '../application/components/ApplicationCancel';
 import ApplicationSaveNotification from '../application/components/ApplicationSaveNotification';
-import useNavigateToApplicationList from '../hanke/hooks/useNavigateToApplicationList';
+import { useNavigateToApplicationList } from '../hanke/hooks/useNavigateToApplicationList';
 import { useGlobalNotification } from '../../common/components/globalNotification/GlobalNotificationContext';
 import useApplicationSendNotification from '../application/hooks/useApplicationSendNotification';
 import useHanke from '../hanke/hooks/useHanke';
@@ -77,11 +77,11 @@ const JohtoselvitysContainer: React.FC<React.PropsWithChildren<Props>> = ({
         },
         contacts: [
           {
-            email: '',
             firstName: '',
             lastName: '',
-            orderer: true,
+            email: '',
             phone: '',
+            orderer: true,
           },
         ],
       },
@@ -105,11 +105,11 @@ const JohtoselvitysContainer: React.FC<React.PropsWithChildren<Props>> = ({
         },
         contacts: [
           {
-            email: '',
             firstName: '',
             lastName: '',
-            orderer: false,
+            email: '',
             phone: '',
+            orderer: false,
           },
         ],
       },
@@ -316,17 +316,28 @@ const JohtoselvitysContainer: React.FC<React.PropsWithChildren<Props>> = ({
 
   const ordererKey = findOrdererKey(getValues('applicationData'));
 
+  const customer = getValues('applicationData.customerWithContacts.customer');
+  const customersContacts = getValues('applicationData.customerWithContacts.contacts');
+  const contractor = getValues('applicationData.contractorWithContacts.customer');
+  const contractorsContacts = getValues('applicationData.contractorWithContacts.contacts');
+  const propertyDeveloper = getValues('applicationData.propertyDeveloperWithContacts.customer');
+  const propertyDevelopersContacts = getValues(
+    'applicationData.propertyDeveloperWithContacts.contacts',
+  );
+  const representative = getValues('applicationData.representativeWithContacts.customer');
+  const representativesContacts = getValues('applicationData.representativeWithContacts.contacts');
+
   // Fields that are validated in each page when moving forward in form
   const pageFieldsToValidate: FieldPath<JohtoselvitysFormValues>[][] = useMemo(
     () => [
       // Basic information page
       [
         'applicationData.name',
-        'applicationData.postalAddress',
+        'applicationData.postalAddress.streetAddress.streetName',
+        'applicationData.constructionWork',
+        'applicationData.rockExcavation',
         'applicationData.workDescription',
         `applicationData.${ordererKey}.contacts`,
-        'applicationData.rockExcavation',
-        'applicationData.constructionWork',
       ],
       // Areas page
       [
@@ -337,15 +348,53 @@ const JohtoselvitysContainer: React.FC<React.PropsWithChildren<Props>> = ({
       ],
       // Contacts page
       [
-        'applicationData.customerWithContacts',
-        'applicationData.contractorWithContacts',
-        'applicationData.propertyDeveloperWithContacts',
-        'applicationData.representativeWithContacts',
+        ...getFieldPaths<JohtoselvitysFormValues>(
+          customer,
+          'applicationData.customerWithContacts.customer',
+        ),
+        ...getFieldPaths<JohtoselvitysFormValues>(
+          customersContacts,
+          'applicationData.customerWithContacts.contacts',
+        ),
+        ...getFieldPaths<JohtoselvitysFormValues>(
+          contractor,
+          'applicationData.contractorWithContacts.customer',
+        ),
+        ...getFieldPaths<JohtoselvitysFormValues>(
+          contractorsContacts,
+          'applicationData.contractorWithContacts.contacts',
+        ),
+        ...getFieldPaths<JohtoselvitysFormValues>(
+          propertyDeveloper,
+          'applicationData.propertyDeveloperWithContacts.customer',
+        ),
+        ...getFieldPaths<JohtoselvitysFormValues>(
+          propertyDevelopersContacts,
+          'applicationData.propertyDeveloperWithContacts.contacts',
+        ),
+        ...getFieldPaths<JohtoselvitysFormValues>(
+          representative,
+          'applicationData.representativeWithContacts.customer',
+        ),
+        ...getFieldPaths<JohtoselvitysFormValues>(
+          representativesContacts,
+          'applicationData.representativeWithContacts.contacts',
+        ),
       ],
       // Attachments page
       ['attachmentNumber'],
     ],
-    [ordererKey],
+    [
+      ordererKey,
+      customer,
+      customersContacts,
+      contractor,
+      contractorsContacts,
+      propertyDeveloper,
+      propertyDevelopersContacts,
+      representative,
+      representativesContacts,
+    ],
   );
 
   const formSteps = useMemo(() => {
diff --git a/src/domain/johtoselvitys/JohtoselvitysForm.test.tsx b/src/domain/johtoselvitys/JohtoselvitysForm.test.tsx
index 9ad8d259c..512dec66b 100644
--- a/src/domain/johtoselvitys/JohtoselvitysForm.test.tsx
+++ b/src/domain/johtoselvitys/JohtoselvitysForm.test.tsx
@@ -617,4 +617,22 @@ test('Form is saved when contacts are filled with orderer information', async ()
 
   expect(screen.queryByText(/hakemus tallennettu/i)).toBeInTheDocument();
   expect(saveApplication).toHaveBeenCalledTimes(1);
+
+  saveApplication.mockRestore();
+});
+
+test('Form is saved when sub contacts are filled with orderer information', async () => {
+  const saveApplication = jest.spyOn(applicationApi, 'saveApplication');
+  const { user } = render(<JohtoselvitysContainer application={applications[0]} />);
+
+  await user.click(screen.getByRole('button', { name: /yhteystiedot/i }));
+  await user.click(
+    screen.getByTestId('applicationData.contractorWithContacts.contacts.0.fillOwnInfoButton'),
+  );
+  await user.click(screen.getByRole('button', { name: /edellinen/i }));
+
+  expect(screen.queryByText(/hakemus tallennettu/i)).toBeInTheDocument();
+  expect(saveApplication).toHaveBeenCalledTimes(1);
+
+  saveApplication.mockRestore();
 });
diff --git a/src/domain/johtoselvitys/validationSchema.ts b/src/domain/johtoselvitys/validationSchema.ts
index 2b1dde9c2..9f3ee7ce0 100644
--- a/src/domain/johtoselvitys/validationSchema.ts
+++ b/src/domain/johtoselvitys/validationSchema.ts
@@ -17,6 +17,7 @@ const contactSchema = yup
     lastName: yup.string().trim().required(),
     email: yup.string().trim().email().max(100).required(),
     phone: yup.string().trim().max(20).required(),
+    orderer: yup.boolean(),
   });
 
 const customerSchema = contactSchema.omit(['firstName', 'lastName']).shape({
@@ -31,6 +32,10 @@ const customerSchema = contactSchema.omit(['firstName', 'lastName']).shape({
         schema.test('is-business-id', 'Is not valid business id', isValidBusinessId),
       otherwise: (schema) => schema,
     }),
+  country: yup.string().nullable(),
+  ovt: yup.string().nullable(),
+  invoicingOperator: yup.string().nullable(),
+  sapCustomerNumber: yup.string().nullable(),
 });
 
 const customerWithContactsSchema = yup.object().shape({
diff --git a/src/domain/mocks/data/hankkeet-data.ts b/src/domain/mocks/data/hankkeet-data.ts
index 875c014f3..a2535fc00 100644
--- a/src/domain/mocks/data/hankkeet-data.ts
+++ b/src/domain/mocks/data/hankkeet-data.ts
@@ -11,13 +11,12 @@ const hankkeet: HankeDataDraft[] = [
     alkuPvm: '2022-11-26T00:00:00Z',
     loppuPvm: '2022-12-17T00:00:00Z',
     vaihe: 'OHJELMOINTI',
-    suunnitteluVaihe: null,
     version: 0,
     createdBy: '1',
     createdAt: '2020-11-27T11:33:17.0875Z',
     modifiedBy: null,
     modifiedAt: null,
-    saveType: 'DRAFT',
+    status: 'DRAFT',
     omistajat: [],
     rakennuttajat: [],
     toteuttajat: [],
@@ -35,13 +34,12 @@ const hankkeet: HankeDataDraft[] = [
     alkuPvm: '2023-01-12T00:00:00Z',
     loppuPvm: '2024-11-27T00:00:00Z',
     vaihe: 'OHJELMOINTI',
-    suunnitteluVaihe: null,
     version: 0,
     createdBy: '1',
     createdAt: '2022-11-27T11:43:43.481215Z',
     modifiedBy: null,
     modifiedAt: null,
-    saveType: 'DRAFT',
+    status: 'PUBLIC',
     liikennehaittaindeksi: {
       indeksi: 4.0,
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -54,7 +52,8 @@ const hankkeet: HankeDataDraft[] = [
       tila: 'VOIMASSA',
       perusIndeksi: 3.5,
       pyorailyIndeksi: 3,
-      joukkoliikenneIndeksi: 4,
+      linjaautoIndeksi: 4,
+      raitiovaunuIndeksi: 2,
       liikennehaittaIndeksi: {
         indeksi: 4,
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -66,20 +65,15 @@ const hankkeet: HankeDataDraft[] = [
         id: 1,
         tyyppi: 'YRITYS',
         nimi: 'Yritys Oy',
-        ytunnusTaiHetu: 'y-1234567',
-        osoite: 'Yrityskuja 5',
-        postinumero: '00100',
-        postitoimipaikka: 'Helsinki',
+        ytunnus: '6006332-9',
         email: 'yritys@testi.com',
         puhelinnumero: '0000000000',
         alikontaktit: [
           {
-            nimi: 'Esa Kauppinen',
-            osoite: 'Lehdenkatu 3',
-            postinumero: '42100',
-            postitoimipaikka: 'Lahti',
+            etunimi: 'Esa',
+            sukunimi: 'Kauppinen',
             email: 'esa.kauppinen@maansiirtofirma.com',
-            puhelinnumero: '',
+            puhelinnumero: '0000000000',
           },
         ],
       },
@@ -89,28 +83,21 @@ const hankkeet: HankeDataDraft[] = [
         id: 1,
         tyyppi: 'YRITYS',
         nimi: 'Yritys 2 Oy',
-        ytunnusTaiHetu: 'y-1234567',
-        osoite: '',
-        postinumero: '',
-        postitoimipaikka: '',
+        ytunnus: '6502327-0',
         email: 'yritys2@testi.com',
-        puhelinnumero: '',
+        puhelinnumero: '1111111111',
         alikontaktit: [
           {
-            nimi: 'Matti Meikäläinen',
-            osoite: 'Katukuja 6',
-            postinumero: '',
-            postitoimipaikka: '',
+            etunimi: 'Matti',
+            sukunimi: 'Meikäläinen',
             email: 'matti.meikalainen@testi.com',
-            puhelinnumero: '',
+            puhelinnumero: '1111111111',
           },
           {
-            nimi: 'Esa Kauppinen',
-            osoite: 'Lehdenkatu 3',
-            postinumero: '42100',
-            postitoimipaikka: 'Lahti',
+            etunimi: 'Esa',
+            sukunimi: 'Kauppinen',
             email: 'esa.kauppinen@maansiirtofirma.com',
-            puhelinnumero: '',
+            puhelinnumero: '1111111111',
           },
         ],
       },
@@ -121,17 +108,15 @@ const hankkeet: HankeDataDraft[] = [
         rooli: 'Isännöitsijä',
         nimi: 'Yritys 3 Oy',
         email: 'yritys3@testi.com',
-        puhelinnumero: '',
+        puhelinnumero: '2222222222',
         organisaatioNimi: 'Organisaatio',
         osasto: '',
         alikontaktit: [
           {
-            nimi: 'Matti Meikäläinen',
-            osoite: 'Katukuja 6',
-            postinumero: '',
-            postitoimipaikka: '',
+            etunimi: 'Matti',
+            sukunimi: 'Meikäläinen',
             email: 'matti.meikalainen@testi.com',
-            puhelinnumero: '',
+            puhelinnumero: '2222222222',
           },
         ],
       },
@@ -247,25 +232,29 @@ const hankkeet: HankeDataDraft[] = [
     alkuPvm: '2023-01-02T00:00:00Z',
     loppuPvm: '2023-02-24T00:00:00Z',
     vaihe: 'OHJELMOINTI',
-    suunnitteluVaihe: null,
     tyomaaTyyppi: ['KAUKOLAMPO'],
     version: 0,
     createdBy: '1',
     createdAt: '2022-11-27T11:44:22.443735Z',
     modifiedBy: null,
     modifiedAt: null,
-    saveType: 'DRAFT',
+    status: 'PUBLIC',
     omistajat: [
       {
         id: 1,
         tyyppi: 'YRITYS',
         nimi: 'Kauppisen maansiirtofirma KY',
-        ytunnusTaiHetu: 'y-1234567',
-        osoite: 'Lahdenkatu 3',
-        postinumero: '42100',
-        postitoimipaikka: 'Lahti',
+        ytunnus: '5341034-5',
         email: 'toimisto@testi.com',
-        puhelinnumero: '',
+        puhelinnumero: '0501234567',
+        alikontaktit: [
+          {
+            etunimi: 'Esa',
+            sukunimi: 'Kauppinen',
+            email: 'esa.kauppinen@maansiirtofirma.com',
+            puhelinnumero: '0507654321',
+          },
+        ],
       },
     ],
     rakennuttajat: [],
@@ -283,7 +272,8 @@ const hankkeet: HankeDataDraft[] = [
       tila: 'VOIMASSA',
       perusIndeksi: 1.5,
       pyorailyIndeksi: 3.5,
-      joukkoliikenneIndeksi: 2,
+      linjaautoIndeksi: 1,
+      raitiovaunuIndeksi: 2,
       liikennehaittaIndeksi: {
         indeksi: 3,
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -346,13 +336,12 @@ const hankkeet: HankeDataDraft[] = [
     loppuPvm: '2022-11-28T00:00:00Z',
     tyomaaKatuosoite: 'Pohjoisesplanadi 2',
     vaihe: 'RAKENTAMINEN',
-    suunnitteluVaihe: null,
     version: 0,
     createdBy: '1',
     createdAt: '2020-11-27T12:07:41.210244Z',
     modifiedBy: null,
     modifiedAt: null,
-    saveType: 'DRAFT',
+    status: 'DRAFT',
     omistajat: [],
     rakennuttajat: [],
     toteuttajat: [],
@@ -369,13 +358,12 @@ const hankkeet: HankeDataDraft[] = [
     alkuPvm: '2022-11-23T00:00:00Z',
     loppuPvm: '2022-11-28T00:00:00Z',
     vaihe: 'OHJELMOINTI',
-    suunnitteluVaihe: null,
     version: 0,
     createdBy: '1',
     createdAt: '2022-11-23T10:37:36.362778Z',
     modifiedBy: null,
     modifiedAt: null,
-    saveType: 'DRAFT',
+    status: 'DRAFT',
     omistajat: [],
     rakennuttajat: [],
     toteuttajat: [],
@@ -392,13 +380,12 @@ const hankkeet: HankeDataDraft[] = [
     alkuPvm: '2022-11-24T00:00:00Z',
     loppuPvm: '2022-11-28T00:00:00Z',
     vaihe: 'SUUNNITTELU',
-    suunnitteluVaihe: null,
     version: 0,
     createdBy: '1',
     createdAt: '2020-11-30T13:43:13.599591Z',
     modifiedBy: null,
     modifiedAt: null,
-    saveType: 'DRAFT',
+    status: 'DRAFT',
     omistajat: [],
     rakennuttajat: [],
     toteuttajat: [],
@@ -415,13 +402,12 @@ const hankkeet: HankeDataDraft[] = [
     alkuPvm: '2022-11-24T00:00:00Z',
     loppuPvm: '2022-11-28T00:00:00Z',
     vaihe: 'SUUNNITTELU',
-    suunnitteluVaihe: null,
     version: 0,
     createdBy: '1',
     createdAt: '2020-11-30T13:43:15.322044Z',
     modifiedBy: null,
     modifiedAt: null,
-    saveType: 'DRAFT',
+    status: 'DRAFT',
     omistajat: [],
     rakennuttajat: [],
     toteuttajat: [],
@@ -438,14 +424,13 @@ const hankkeet: HankeDataDraft[] = [
     alkuPvm: '2022-11-24T00:00:00Z',
     loppuPvm: '2022-11-28T00:00:00Z',
     vaihe: 'OHJELMOINTI',
-    suunnitteluVaihe: null,
     version: 0,
     createdBy: '1',
     createdAt: '2020-11-30T13:43:24.301796Z',
     modifiedBy: null,
     modifiedAt: null,
-    saveType: 'DRAFT',
     omistajat: [],
+    status: 'DRAFT',
     rakennuttajat: [],
     toteuttajat: [],
     muut: [],
@@ -461,13 +446,12 @@ const hankkeet: HankeDataDraft[] = [
     alkuPvm: '2022-11-24T00:00:00Z',
     loppuPvm: '2022-11-28T00:00:00Z',
     vaihe: 'OHJELMOINTI',
-    suunnitteluVaihe: null,
     version: 0,
     createdBy: '1',
     createdAt: '2020-11-30T13:43:27.330822Z',
     modifiedBy: null,
     modifiedAt: null,
-    saveType: 'DRAFT',
+    status: 'DRAFT',
     omistajat: [],
     rakennuttajat: [],
     toteuttajat: [],
@@ -484,13 +468,12 @@ const hankkeet: HankeDataDraft[] = [
     alkuPvm: '2022-12-02T00:00:00Z',
     loppuPvm: '2022-12-05T00:00:00Z',
     vaihe: 'OHJELMOINTI',
-    suunnitteluVaihe: null,
     version: 0,
     createdBy: '1',
     createdAt: '2020-12-01T14:22:11.838844Z',
     modifiedBy: null,
     modifiedAt: null,
-    saveType: 'DRAFT',
+    status: 'DRAFT',
     omistajat: [],
     rakennuttajat: [],
     toteuttajat: [],
@@ -507,13 +490,12 @@ const hankkeet: HankeDataDraft[] = [
     alkuPvm: '2022-12-02T00:00:00Z',
     loppuPvm: '2022-11-28T00:00:00Z',
     vaihe: 'OHJELMOINTI',
-    suunnitteluVaihe: null,
     version: 0,
     createdBy: '1',
     createdAt: '2020-12-01T14:34:24.443622Z',
     modifiedBy: null,
     modifiedAt: null,
-    saveType: 'DRAFT',
+    status: 'DRAFT',
     omistajat: [],
     rakennuttajat: [],
     toteuttajat: [],
diff --git a/src/domain/mocks/data/hankkeet.ts b/src/domain/mocks/data/hankkeet.ts
index 8db2bc464..e75cabf9f 100644
--- a/src/domain/mocks/data/hankkeet.ts
+++ b/src/domain/mocks/data/hankkeet.ts
@@ -22,7 +22,6 @@ export async function create(data: HankeDataDraft) {
   const newHanke: HankeDataDraft = {
     id: hankkeet.length + 1,
     hankeTunnus: generateHankeTunnus(),
-    suunnitteluVaihe: null,
     tyomaaKatuosoite: '',
     tyomaaTyyppi: [],
     alueet: [],
diff --git a/src/domain/mocks/handlers.ts b/src/domain/mocks/handlers.ts
index fba56251c..4a3408ad7 100644
--- a/src/domain/mocks/handlers.ts
+++ b/src/domain/mocks/handlers.ts
@@ -5,7 +5,7 @@ import * as hankkeetDB from './data/hankkeet';
 import * as hakemuksetDB from './data/hakemukset';
 import * as usersDB from './data/users';
 import ApiError from './apiError';
-import { SignedInUser } from '../hanke/hankeUsers/hankeUser';
+import { IdentificationResponse, SignedInUser } from '../hanke/hankeUsers/hankeUser';
 
 const apiUrl = '/api';
 
@@ -186,6 +186,19 @@ export const handlers = [
   }),
 
   rest.get('/api/hankkeet/:hankeTunnus/whoami', async (req, res, ctx) => {
+    const { hankeTunnus } = req.params;
+
+    if (hankeTunnus === 'SMTGEN2_1') {
+      return res(
+        ctx.status(200),
+        ctx.json<SignedInUser>({
+          hankeKayttajaId: '3fa85f64-5717-4562-b3fc-2c963f66afa6',
+          kayttooikeustaso: 'KATSELUOIKEUS',
+          kayttooikeudet: ['VIEW'],
+        }),
+      );
+    }
+
     return res(
       ctx.status(200),
       ctx.json<SignedInUser>({
@@ -200,8 +213,24 @@ export const handlers = [
           'MODIFY_DELETE_PERMISSIONS',
           'EDIT_APPLICATIONS',
           'MODIFY_APPLICATION_PERMISSIONS',
+          'RESEND_INVITATION',
         ],
       }),
     );
   }),
+
+  rest.post(`${apiUrl}/kayttajat`, async (req, res, ctx) => {
+    return res(
+      ctx.status(200),
+      ctx.json<IdentificationResponse>({
+        kayttajaId: '3fa85f64-5717-4562-b3fc-2c963f66afa6',
+        hankeTunnus: 'HAI22-2',
+        hankeNimi: 'Aidasmäentien vesihuollon rakentaminen',
+      }),
+    );
+  }),
+
+  rest.post(`${apiUrl}/kayttajat/:kayttajaId/kutsu`, async (req, res, ctx) => {
+    return res(ctx.delay(), ctx.status(204));
+  }),
 ];
diff --git a/src/domain/mocks/hankeDraft.ts b/src/domain/mocks/hankeDraft.ts
index 4cc9e62f8..2f4519d7b 100644
--- a/src/domain/mocks/hankeDraft.ts
+++ b/src/domain/mocks/hankeDraft.ts
@@ -9,13 +9,12 @@ const hankeDraft: HankeDataDraft = {
   alkuPvm: '2023-11-26T00:00:00Z',
   loppuPvm: '2024-11-17T00:00:00Z',
   vaihe: 'OHJELMOINTI',
-  suunnitteluVaihe: null,
   version: 0,
   createdBy: '1',
   createdAt: '2023-11-27T11:33:17.0875Z',
   modifiedBy: null,
   modifiedAt: null,
-  saveType: 'DRAFT',
+  status: 'DRAFT',
   omistajat: [],
   rakennuttajat: [],
   toteuttajat: [],
diff --git a/src/domain/mocks/hankeIndexData.ts b/src/domain/mocks/hankeIndexData.ts
index b5911bdb2..e2294e369 100644
--- a/src/domain/mocks/hankeIndexData.ts
+++ b/src/domain/mocks/hankeIndexData.ts
@@ -10,7 +10,8 @@ const hankeIndexData: HankeIndexData = {
   },
   perusIndeksi: 4,
   pyorailyIndeksi: 3,
-  joukkoliikenneIndeksi: 1,
+  linjaautoIndeksi: 2,
+  raitiovaunuIndeksi: 1,
   tila: HANKE_INDEX_STATE.VOIMASSA,
 };
 
diff --git a/src/domain/mocks/hankeList.ts b/src/domain/mocks/hankeList.ts
index 1a1de5763..c42e1af82 100644
--- a/src/domain/mocks/hankeList.ts
+++ b/src/domain/mocks/hankeList.ts
@@ -10,13 +10,12 @@ const hankeList: HankeData[] = [
     alkuPvm: '2022-10-02:00:00Z',
     loppuPvm: '2022-10-10:00:00Z',
     vaihe: 'OHJELMOINTI',
-    suunnitteluVaihe: null,
     version: 0,
     createdBy: '1',
     createdAt: '2020-11-27T11:33:17.0875Z',
     modifiedBy: null,
     modifiedAt: null,
-    saveType: 'DRAFT',
+    status: 'PUBLIC',
     omistajat: [],
     rakennuttajat: [],
     toteuttajat: [],
@@ -79,13 +78,12 @@ const hankeList: HankeData[] = [
     alkuPvm: '2022-10-02:00:00Z',
     loppuPvm: '2022-10-05:00:00Z',
     vaihe: 'OHJELMOINTI',
-    suunnitteluVaihe: null,
     version: 0,
     createdBy: '1',
     createdAt: '2020-11-27T11:43:43.481215Z',
     modifiedBy: null,
     modifiedAt: null,
-    saveType: 'DRAFT',
+    status: 'DRAFT',
     omistajat: [],
     rakennuttajat: [],
     toteuttajat: [],
diff --git a/src/domain/types/hanke.ts b/src/domain/types/hanke.ts
index 11f8adb03..5476303f5 100644
--- a/src/domain/types/hanke.ts
+++ b/src/domain/types/hanke.ts
@@ -8,14 +8,6 @@ export enum HANKE_VAIHE {
 }
 export type HANKE_VAIHE_KEY = keyof typeof HANKE_VAIHE;
 
-export enum HANKE_SUUNNITTELUVAIHE {
-  YLEIS_TAI_HANKE = 'YLEIS_TAI_HANKE',
-  KATUSUUNNITTELU_TAI_ALUEVARAUS = 'KATUSUUNNITTELU_TAI_ALUEVARAUS',
-  RAKENNUS_TAI_TOTEUTUS = 'RAKENNUS_TAI_TOTEUTUS',
-  TYOMAAN_TAI_HANKKEEN_AIKAINEN = 'TYOMAAN_TAI_HANKKEEN_AIKAINEN',
-}
-export type HANKE_SUUNNITTELUVAIHE_KEY = keyof typeof HANKE_SUUNNITTELUVAIHE;
-
 export enum HANKE_TYOMAATYYPPI {
   VESI = 'VESI',
   VIEMARI = 'VIEMARI',
@@ -23,7 +15,6 @@ export enum HANKE_TYOMAATYYPPI {
   SAHKO = 'SAHKO',
   TIETOLIIKENNE = 'TIETOLIIKENNE',
   LIIKENNEVALO = 'LIIKENNEVALO',
-  YKT = 'YKT',
   ULKOVALAISTUS = 'ULKOVALAISTUS',
   KAAPPITYO = 'KAAPPITYO',
   KAUKOLAMPO = 'KAUKOLAMPO',
@@ -91,13 +82,6 @@ export enum HANKE_TARINAHAITTA {
 }
 export type HANKE_TARINAHAITTA_KEY = keyof typeof HANKE_TARINAHAITTA;
 
-export enum HANKE_SAVETYPE {
-  AUTO = 'AUTO',
-  DRAFT = 'DRAFT',
-  SUBMIT = 'SUBMIT',
-}
-export type HANKE_SAVETYPE_KEY = keyof typeof HANKE_SAVETYPE;
-
 export enum HANKE_CONTACT_TYPE {
   OMISTAJAT = 'omistajat',
   RAKENNUTTAJAT = 'rakennuttajat',
@@ -111,18 +95,19 @@ export type HankeContactTypeKey =
   | HANKE_CONTACT_TYPE.MUUTTAHOT;
 
 export interface HankeSubContact {
-  nimi: string;
-  osoite?: string;
-  postinumero?: string;
-  postitoimipaikka?: string;
+  etunimi: string;
+  sukunimi: string;
   email: string;
   puhelinnumero: string;
 }
 
-export interface HankeContact extends HankeSubContact {
+export interface HankeContact {
   id: number | null;
   tyyppi: keyof typeof CONTACT_TYYPPI | null;
-  ytunnusTaiHetu: string;
+  nimi: string;
+  email: string;
+  puhelinnumero: string;
+  ytunnus: string | null;
   alikontaktit?: HankeSubContact[];
 }
 
@@ -139,7 +124,7 @@ export type HankeMuuTaho = {
 export type HankeContacts = Array<(HankeContact | HankeMuuTaho)[] | undefined>;
 
 export function isHankeContact(contact: HankeContact | HankeMuuTaho): contact is HankeContact {
-  return (contact as HankeContact).ytunnusTaiHetu !== undefined;
+  return (contact as HankeContact).ytunnus !== undefined;
 }
 
 export enum CONTACT_TYYPPI {
@@ -186,6 +171,14 @@ export enum HANKE_INDEX_STATE {
 
 export type HANKE_INDEX_STATE_KEY = keyof typeof HANKE_INDEX_STATE;
 
+enum HANKE_STATUS {
+  DRAFT = 'DRAFT',
+  PUBLIC = 'PUBLIC',
+  ENDED = 'ENDED',
+}
+
+type HANKE_STATUS_KEY = keyof typeof HANKE_STATUS;
+
 export interface HankeData {
   id: number;
   hankeTunnus: string;
@@ -195,7 +188,6 @@ export interface HankeData {
   alkuPvm: string;
   loppuPvm: string;
   vaihe: HANKE_VAIHE_KEY;
-  suunnitteluVaihe: HANKE_SUUNNITTELUVAIHE_KEY | null;
   tyomaaKatuosoite: string | null;
   tyomaaTyyppi: HANKE_TYOMAATYYPPI_KEY[];
   alueet: HankeAlue[];
@@ -205,7 +197,7 @@ export interface HankeData {
   toteuttajat: Array<HankeContact>;
   muut: Array<HankeMuuTaho>;
   tormaystarkasteluTulos: HankeIndexData | null;
-  saveType: HANKE_SAVETYPE_KEY;
+  status: HANKE_STATUS_KEY;
   version?: number;
   createdBy?: string;
   createdAt?: string;
@@ -220,7 +212,8 @@ export interface HankeIndexData {
   liikennehaittaIndeksi: LiikenneHaittaIndeksi;
   perusIndeksi: number;
   pyorailyIndeksi: number;
-  joukkoliikenneIndeksi: number;
+  linjaautoIndeksi: number;
+  raitiovaunuIndeksi: number;
   tila: HANKE_INDEX_STATE_KEY;
 }
 
diff --git a/src/locales/en.json b/src/locales/en.json
index 1099f9351..e761b0dc8 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -22,6 +22,10 @@
       "confirmButton": "Confirm"
     },
     "components": {
+      "link": {
+        "openInNewTabAriaLabel": "Opens in a new tab.",
+        "openInExternalDomainAriaLabel": "Leads to another website."
+      },
       "linkbox": {
         "linkbox": "Link box"
       },
@@ -47,6 +51,7 @@
       }
     },
     "error": "An error occurred. Try again.",
+    "dataNotFound": "No information found",
     "ariaLabels": {
       "profileButton": "User profile",
       "menuToggle": "Menu",
@@ -113,14 +118,18 @@
     },
     "notifications": {
       "labels": {
-        "attachmentRemoved": "Attachment removed"
+        "attachmentRemoved": "Attachment removed",
+        "editSentApplication": "You are about to edit an application that has already been sent."
       },
       "descriptions": {
-        "attachmentRemoved": "Attachment {{fileName}} was removed"
+        "attachmentRemoved": "Attachment {{fileName}} was removed",
+        "editSentApplication": "You can edit the application until it enters processing. The new version of the application is automatically sent to the authorities when the form is saved."
       }
     },
     "buttons": {
-      "loadingAttachments": "Loading attachments..."
+      "loadingAttachments": "Loading attachments...",
+      "saveChanges": "Save changes",
+      "fillWithOwnInformation": "Fill out with your own information"
     },
     "helperTexts": {
       "dateInForm": "Enter in format D.M.YYYY",
@@ -163,7 +172,8 @@
       "labels": {
         "tyyppi": "Type",
         "nimi": "Name",
-        "ytunnusTaiHetu": "Business ID or personal identity code",
+        "etunimi": "First name",
+        "sukunimi": "Last name",
         "ytunnus": "Business ID",
         "osoite": "Street address",
         "postinumero": "Postal code",
@@ -228,9 +238,9 @@
     },
     "ACCESS_RIGHTS": {
       "path": "/projectportfolio/:hankeTunnus/oikeudet",
-      "headerLabel": "Käyttöoikeudet",
+      "headerLabel": "Access rights",
       "meta": {
-        "title": "Haitaton - Käyttöoikeuksien hallinta"
+        "title": "Haitaton - Access rights management"
       }
     },
     "PUBLIC_HANKKEET": {
@@ -269,7 +279,7 @@
       }
     },
     "FULL_PAGE_MAP": {
-      "path": "/kokosivunkartta/:hankeTunnus",
+      "path": "/fullpagemap/:hankeTunnus",
       "headerLabel": "Full-page map",
       "meta": {
         "title": "Haitaton - Full-page map"
@@ -337,6 +347,13 @@
       "meta": {
         "title": "Haitaton - Manual and support"
       }
+    },
+    "IDENTIFY_USER": {
+      "path": "/invitation",
+      "headerLabel": "Log in to Haitaton",
+      "meta": {
+        "title": "Haitaton - Log in to Haitaton"
+      }
     }
   },
   "hanke": {
@@ -345,12 +362,6 @@
       "OHJELMOINTI": "Programming",
       "RAKENTAMINEN": "Construction"
     },
-    "suunnitteluVaihe": {
-      "YLEIS_TAI_HANKE": "General or project planning",
-      "KATUSUUNNITTELU_TAI_ALUEVARAUS": "Street planning or planning of area reservations",
-      "RAKENNUS_TAI_TOTEUTUS": "Construction planning or implementation planning",
-      "TYOMAAN_TAI_HANKKEEN_AIKAINEN": "Early planning of a worksite or project"
-    },
     "tyomaaTyyppi": {
       "VESI": "Water",
       "VIEMARI": "Sewer",
@@ -456,7 +467,6 @@
       "nimi": "Project name",
       "vaihe": "Project phase",
       "kuvaus": "Project description",
-      "suunnitteluVaihe": "Project planning phase",
       "alkuPvm": "Project start date",
       "loppuPvm": "Project end date",
       "tyomaaTyyppi": "Worksite type",
@@ -487,9 +497,8 @@
       "onYKTHanke": "Joint municipal worksite – a joint project under the cooperation agreement. In addition to the City of Helsinki’s Urban Environment Division, the parties are Helsinki City Transport (HKL), Helsinki Region Environmental Services (HSY), Helen Ltd, Helen Electricity Network Ltd, Auris Kaasunjakelu Ltd and the communications network operators Cinia Ltd, DNA Plc, Elisa Plc and Telia Finland Plc. The aim of the Shared Public Utility Site (YKT) partnership is to streamline the construction of public spaces in the city and adapt the contracting parties’ individual projects into jointly implemented projects that improve the quality and supply of infrastructure services.",
       "alkuPvm": "Start date of project implementation (Note! Implementation in a public area, not, for example, on a plot)",
       "loppuPvm": "End date of project implementation (Note! Implementation in a public area, not, for example, on the side of a plot)",
-      "vaihe": "A description of the progress of the project which will be updated as the project progresses. The programming phase is the initial project planning or pre-planning phase. The planning phase has subphases depending on the level of detail of the planning. In terms of the permit application process, the project is in the planning phase until it receives an execution permit from the city. At the construction phase, the project has received a permit from the city. Haitaton does not cover the permit application, construction or completion/maintenance/handover phases of the project.",
+      "vaihe": "A description of the progress of the project which will be updated as the project progresses. The programming phase is the initial project planning or pre-planning phase. In terms of the permit application process, the project is in the planning phase until it receives an execution permit from the city. At the construction phase, the project has received a permit from the city. Haitaton does not cover the permit application, construction or completion/maintenance/handover phases of the project.",
       "kuvaus": "Description of the main content and objectives of the project. (Note! Implementation in a public area, not, for example, on the side of a plot)",
-      "suunnitteluVaihe": "A subphase refining the planning phase, which will be updated as the project progresses.",
       "omistajat": "The project owner is responsible for the entire project from its beginning to its end/completion/handover.",
       "arvioijat": "The project analyst or assessor may be the project owner or another party authorised by the owner (for example, a project planning consultant or contractor not affiliated with the owner).",
       "toteuttajat": "The person responsible for implementing the project may be the project owner or another party authorised by the owner (for example, a contractor not affiliated with the owner).",
@@ -647,7 +656,6 @@
     "liikennehaittaindeksi": "Traffic nuisance index",
     "ruuhkautuminen": "Congestion",
     "pyorailynPaareitti": "Main cycling route",
-    "merkittavatJoukkoliikennereitit": "Major public transport routes",
     "kiertoreittitarve": "Detour need",
     "KIERTOREITTITARPEET": {
       "TODENNAKOINEN": "likely",
@@ -759,7 +767,6 @@
     "labels": {
       "kuvaus": "Project description",
       "hankeVaihe": "Project phase",
-      "suunnitteluVaihe": "Planning phase",
       "katuosoite": "Street address",
       "avaaKartalla": "Open on a map",
       "hankkeenKesto": "Project duration",
@@ -814,6 +821,48 @@
       "toLastPage": "To the last page of the list"
     }
   },
+  "hankeUsers": {
+    "accessRights": "Access rights",
+    "manageRights": "Access rights management",
+    "accessRightLevels": {
+      "KAIKKI_OIKEUDET": "All rights",
+      "KAIKKIEN_MUOKKAUS": "Project and application editing",
+      "HANKEMUOKKAUS": "Project editing",
+      "HAKEMUSASIOINTI": "Application services",
+      "KATSELUOIKEUS": "Viewing right"
+    },
+    "accessRightsInfo": {
+      "heading": "What can be done with the different rights?",
+      "KAIKKI_OIKEUDET": "<strong>All rights</strong> enables you to edit a project and its application content, edit everyone’s access rights and remove a project if it has no applications that have received a decision.",
+      "KAIKKIEN_MUOKKAUS": "The <strong>project and application editing</strong> right enables you to create and edit a project and the content of its applications and edit others’ access rights, except ‘all rights’, which enables removing a project.",
+      "HANKEMUOKKAUS": "The <strong>project editing</strong> right enables you to edit the information of a project but not access rights. This right enables you to view the application information.",
+      "HAKEMUSASIOINTI": "The <strong>application services</strong> right enables you to create new applications for a project and edit the information of the applications of the project.",
+      "KATSELUOIKEUS": "The <strong>viewing right</strong> enables you to view a project and its information. The viewing right is automatically granted to all persons added to the project and its applications.",
+      "modifyInfo": "You can change access rights by making a selection in the dropdown menu and clicking the ‘Save’ button. You can also send someone a new invitation link to Haitaton if they have not received it before."
+    },
+    "search": {
+      "placeholder": "Example: Matti Meikäläinen",
+      "helperText": "Search by name"
+    },
+    "notifications": {
+      "rightsUpdatedSuccessLabel": "Access rights updated",
+      "rightsUpdatedSuccessText": "Access rights successfully updated",
+      "rightsUpdatedErrorLabel": "Error in the updating process",
+      "rightsUpdatedErrorText": "<0>An error occurred when updating access rights. Please try again later or contact the Haitaton technical support by email <1>haitatontuki@hel.fi</1>.</0>",
+      "userIdentifiedLabel": "Login successful",
+      "userIdentifiedText": "Login successful. You have now been added to the project ({{hankeNimi}} {{hankeTunnus}}).",
+      "userIdentifiedError": "Login failed",
+      "invitationSentSuccessLabel": "Invitation link sent",
+      "invitationSentSuccessText": "Invitation link sent to the address {{email}}.",
+      "invitationSentErrorLabel": "Error when sending the link",
+      "invitationSentErrorText": "<0>An error occurred when sending the invitation link. Please try again later or contact the Haitaton technical support by email <1>haitatontuki@hel.fi</1>.</0>"
+    },
+    "buttons": {
+      "resendInvitation": "Resend the invitation link",
+      "invitationSent": "Invitation link sent"
+    },
+    "userIdentified": "User logged in"
+  },
   "map": {
     "controls": {
       "ariaLayerMenu": "Selecting map levels"
@@ -841,6 +890,8 @@
   "staticPages": {
     "infoPage": {
       "title": "About Haitaton",
+      "releaseInfo": "Publication information",
+      "releaseVer1": "Version JS.01 published on 19 June 2023: Creating a cable report",
       "materials": "Materials",
       "mapMaterials": "Map materials",
       "imageCopyrights": "Images author information"
diff --git a/src/locales/fi.json b/src/locales/fi.json
index f9ccb1e90..d561b9a62 100644
--- a/src/locales/fi.json
+++ b/src/locales/fi.json
@@ -172,7 +172,8 @@
       "labels": {
         "tyyppi": "Tyyppi",
         "nimi": "Nimi",
-        "ytunnusTaiHetu": "Y-tunnus tai henkilötunnus",
+        "etunimi": "Etunimi",
+        "sukunimi": "Sukunimi",
         "ytunnus": "Y-tunnus",
         "osoite": "Katuosoite",
         "postinumero": "Postinumero",
@@ -346,6 +347,13 @@
       "meta": {
         "title": "Haitaton - Käyttöohjeet ja tuki"
       }
+    },
+    "IDENTIFY_USER": {
+      "path": "/kutsu",
+      "headerLabel": "Tunnistaudu Haitattomaan",
+      "meta": {
+        "title": "Haitaton - Tunnistaudu Haitattomaan"
+      }
     }
   },
   "hanke": {
@@ -354,12 +362,6 @@
       "OHJELMOINTI": "Ohjelmointi",
       "RAKENTAMINEN": "Rakentaminen"
     },
-    "suunnitteluVaihe": {
-      "YLEIS_TAI_HANKE": "Yleis- tai hankesuunnittelu",
-      "KATUSUUNNITTELU_TAI_ALUEVARAUS": "Katusuunnittelu tai aluevarauksen suunnittelu",
-      "RAKENNUS_TAI_TOTEUTUS": "Rakennus- tai toteutussuunnittelu",
-      "TYOMAAN_TAI_HANKKEEN_AIKAINEN": "Työmaan tai hankkeen aikainen suunnittelu"
-    },
     "tyomaaTyyppi": {
       "VESI": "Vesi",
       "VIEMARI": "Viemäri",
@@ -454,6 +456,8 @@
     "savingSuccessText": "Luonnos on tallennettu Hankelistalle",
     "savingFailHeader": "Joku meni vikaan",
     "savingFailText": "Luonnosta ei saatu tallennettua, koita uudelleen",
+    "saveAndQuitSuccessHeader": "Hanke tallennettu",
+    "saveAndQuitSuccessText": "Hanke {{name}} ({{hankeTunnus}}) tallennettu omiin hankkeisiin.",
     "closeAriaLabel": "Poistu kaavakkeelta tallentamatta",
     "confirmIndexCalculationButton": "Jatka indeksilaskentaan",
     "cancelDialog": {
@@ -465,7 +469,6 @@
       "nimi": "Hankkeen nimi",
       "vaihe": "Hankkeen vaihe",
       "kuvaus": "Hankkeen kuvaus",
-      "suunnitteluVaihe": "Hankkeen suunnitteluvaihe",
       "alkuPvm": "Hankkeen alkupäivä",
       "loppuPvm": "Hankkeen loppupäivä",
       "tyomaaTyyppi": "Työn tyyppi",
@@ -496,9 +499,8 @@
       "onYKTHanke": "Yhteinen kunnallistekninen työmaa – yhteistoimintasopimuksen mukainen yhteishanke. Osapuolia ovat Helsingin kaupungin kaupunkiympäristön toimialan lisäksi Helsingin kaupungin liikenne -liikelaitos (HKL), Helsingin seudun ympäristöpalvelut -kuntayhtymä HSY,  Helen Oy, Helen Sähköverkko Oy, Auris Kaasunjakelu Oy sekä viestintäverkko operaattorit Cinia Oy, DNA Oyj, Elisa Oyj ja Telia Finland Oyj. YKT -yhteistoiminnalla pyritään sujuvoittamaan kaupungissa tapahtuvaa yleisten alueiden rakentamista ja sovittamaan sopijaosapuolten erillishankkeet yhteisesti toteutettaviksi, infrapalvelujen laatua ja tarjontaa parantaviksi hankkeiksi.",
       "alkuPvm": "Hankkeen toteutuksen aloituspäivä (Huom! Yleisellä alueella tapahtuva toteutus, ei esimerkiksi tontin puolella tapahtuva toteutus)",
       "loppuPvm": "Hankkeen toteutuksen lopetuspäivä (Huom! Yleisellä alueella tapahtuva toteutus, ei esimerkiksi tontin puolella tapahtuva toteutus)",
-      "vaihe": "Hankkeen etenemisen tilan kuvaus, jota päivitetään hankkeen edetessä. Ohjelmointivaihe on alustava hankesuunnittelu- tai esisuunnitteluvaihe. Suunnitteluvaiheessa on alavaiheita suunnittelutason tarkkuuden mukaan. Luvanhakuprosessin kannalta hanke on suunnitteluvaiheessa niin kauan, kunnes se saa toteutusluvan kaupungilta. Rakentamisvaiheessa hanke on saanut luvan kaupungilta. Haitaton ei käsittele luvanhaun, rakentamisvaiheen tai hankkeen valmistumisen/ylläpidon/luovutuksen vaiheita.",
+      "vaihe": "Hankkeen etenemisen tilan kuvaus, jota päivitetään hankkeen edetessä. Ohjelmointivaihe on alustava hankesuunnittelu- tai esisuunnitteluvaihe. Luvanhakuprosessin kannalta hanke on suunnitteluvaiheessa niin kauan, kunnes se saa toteutusluvan kaupungilta. Rakentamisvaiheessa hanke on saanut luvan kaupungilta. Haitaton ei käsittele luvanhaun, rakentamisvaiheen tai hankkeen valmistumisen/ylläpidon/luovutuksen vaiheita.",
       "kuvaus": "Hankkeen keskeisen sisällön ja tavoitteiden kuvaus. (Huom! Yleisellä alueella tapahtuva toteutus, ei esimerkiksi tontin puolella tapahtuva toteutus)",
-      "suunnitteluVaihe": "Suunnitteluvaihetta tarkentava alavaihe, jota päivitetään hankkeen edetessä.",
       "omistajat": "Hankkeen omistaja vastaa koko hankkeesta sen alusta aina loppumiseen / valmistumiseen / luovutukseen asti.",
       "arvioijat": "Hankkeen analysoija tai arvioija voi olla hankkeen omistaja tai omistajan valtuuttama muu taho (esimerkiksi omistajatahon ulkopuolinen hankkeen suunnittelijakonsultti tai urakoitsija).",
       "toteuttajat": "Hankkeen toteutuksesta vastaava voi olla hankkeen omistaja tai omistajan valtuuttama muu taho (esimerkiksi omistajatahon ulkopuolinen urakoitsija).",
@@ -656,7 +658,8 @@
     "liikennehaittaindeksi": "Liikennehaittaindeksi",
     "ruuhkautuminen": "Ruuhkautuminen",
     "pyorailynPaareitti": "Pyöräilyn pääreitti",
-    "merkittavatJoukkoliikennereitit": "Merkittävät joukkoliikennereitit",
+    "joukkoliikenneRaitiovaunu": "Joukkoliikenteen merkittävyys: Raitioliikenne",
+    "joukkoliikenneLinjaauto": "Joukkoliikenteen merkittävyys: Linja-autojen paikallisliikenne",
     "kiertoreittitarve": "Kiertoreittitarve",
     "KIERTOREITTITARPEET": {
       "TODENNAKOINEN": "todennäköinen",
@@ -768,7 +771,6 @@
     "labels": {
       "kuvaus": "Hankkeen kuvaus",
       "hankeVaihe": "Hankkeen vaihe",
-      "suunnitteluVaihe": "Suunnitteluvaihe",
       "katuosoite": "Katuosoite",
       "avaaKartalla": "Avaa kartalla",
       "hankkeenKesto": "Hankkeen kesto",
@@ -850,8 +852,20 @@
       "rightsUpdatedSuccessLabel": "Käyttöoikeudet päivitetty",
       "rightsUpdatedSuccessText": "Käyttöoikeudet on päivitetty onnistuneesti",
       "rightsUpdatedErrorLabel": "Virhe päivityksessä",
-      "rightsUpdatedErrorText": "<0>Käyttöoikeuksien päivityksessä tapahtui virhe. Yritä myöhemmin uudelleen tai ota yhteyttä Haitattoman tekniseen tukeen sähköpostiosoitteessa <1>haitatontuki@hel.fi</1>.</0>"
-    }
+      "rightsUpdatedErrorText": "<0>Käyttöoikeuksien päivityksessä tapahtui virhe. Yritä myöhemmin uudelleen tai ota yhteyttä Haitattoman tekniseen tukeen sähköpostiosoitteessa <1>haitatontuki@hel.fi</1>.</0>",
+      "userIdentifiedLabel": "Tunnistautuminen onnistui",
+      "userIdentifiedText": "Tunnistautuminen onnistui. Sinut on nyt lisätty hankkeelle ({{hankeNimi}} {{hankeTunnus}}).",
+      "userIdentifiedError": "Tunnistautuminen epäonnistui",
+      "invitationSentSuccessLabel": "Kutsulinkki lähetetty",
+      "invitationSentSuccessText": "Kutsulinkki lähetetty osoitteeseen {{email}}.",
+      "invitationSentErrorLabel": "Virhe linkin lähettämisessä",
+      "invitationSentErrorText": "<0>Kutsulinkin lähettämisessä tapahtui virhe. Yritä myöhemmin uudelleen tai ota yhteyttä Haitattoman tekniseen tukeen sähköpostiosoitteessa <1>haitatontuki@hel.fi</1>.</0>"
+    },
+    "buttons": {
+      "resendInvitation": "Lähetä kutsulinkki uudelleen",
+      "invitationSent": "Kutsulinkki lähetetty"
+    },
+    "userIdentified": "Käyttäjä tunnistautunut"
   },
   "map": {
     "controls": {
diff --git a/src/locales/sv.json b/src/locales/sv.json
index 482cdc482..6ebdeb44b 100644
--- a/src/locales/sv.json
+++ b/src/locales/sv.json
@@ -22,6 +22,10 @@
       "confirmButton": "Bekräfta"
     },
     "components": {
+      "link": {
+        "openInNewTabAriaLabel": "Öppnas i en ny flik.",
+        "openInExternalDomainAriaLabel": "Går till en annan webbplats."
+      },
       "linkbox": {
         "linkbox": "Länkområde"
       },
@@ -47,6 +51,7 @@
       }
     },
     "error": "Det inträffade ett fel. Försök på nytt.",
+    "dataNotFound": "Inga uppgifter hittades",
     "ariaLabels": {
       "profileButton": "Användarprofil",
       "menuToggle": "Meny",
@@ -113,14 +118,18 @@
     },
     "notifications": {
       "labels": {
-        "attachmentRemoved": "Bilagd fil har raderats"
+        "attachmentRemoved": "Bilagd fil har raderats",
+        "editSentApplication": "Du ändrar i en redan skickad ansökan."
       },
       "descriptions": {
-        "attachmentRemoved": "Bilagd fil {{fileName}} har raderats"
+        "attachmentRemoved": "Bilagd fil {{fileName}} har raderats",
+        "editSentApplication": "Du kan ändra ansökan tills den tas för handläggning. En ny version av ansökan skickas automatiskt till myndigheten när blanketten sparas."
       }
     },
     "buttons": {
-      "loadingAttachments": "Filer laddas…"
+      "loadingAttachments": "Filer laddas…",
+      "saveChanges": "Spara ändringarna",
+      "fillWithOwnInformation": "Fyll i med egna uppgifter"
     },
     "helperTexts": {
       "dateInForm": "Ge i formatet DD.MM.ÅÅÅÅ",
@@ -163,7 +172,8 @@
       "labels": {
         "tyyppi": "Typ",
         "nimi": "Namn",
-        "ytunnusTaiHetu": "FO-nummer eller personbeteckning",
+        "etunimi": "Förnamn",
+        "sukunimi": "Efternamn",
         "ytunnus": "FO-nummer",
         "osoite": "Gatuadress",
         "postinumero": "Postnummer",
@@ -228,9 +238,9 @@
     },
     "ACCESS_RIGHTS": {
       "path": "/projektportfolj/:hankeTunnus/oikeudet",
-      "headerLabel": "Käyttöoikeudet",
+      "headerLabel": "Användningsrättigheter",
       "meta": {
-        "title": "Haitaton - Käyttöoikeuksien hallinta"
+        "title": "Haitaton – Hantering av användningsrättigheter"
       }
     },
     "PUBLIC_HANKKEET": {
@@ -269,7 +279,7 @@
       }
     },
     "FULL_PAGE_MAP": {
-      "path": "/kokosivunkartta/:hankeTunnus",
+      "path": "/kartaoverhelasidan/:hankeTunnus",
       "headerLabel": "Karta över hela sidan",
       "meta": {
         "title": "Haitaton – Karta över hela sidan"
@@ -337,6 +347,13 @@
       "meta": {
         "title": "Haitaton - Bruksanvisning och support"
       }
+    },
+    "IDENTIFY_USER": {
+      "path": "/inbjudan",
+      "headerLabel": "Identifiera dig i Haitaton",
+      "meta": {
+        "title": "Haitaton – Identifiera dig i Haitaton"
+      }
     }
   },
   "hanke": {
@@ -345,12 +362,6 @@
       "OHJELMOINTI": "Programmering",
       "RAKENTAMINEN": "Byggande"
     },
-    "suunnitteluVaihe": {
-      "YLEIS_TAI_HANKE": "Översikts- eller projektplanering",
-      "KATUSUUNNITTELU_TAI_ALUEVARAUS": "Gatuplanering eller planering av områdesreservering",
-      "RAKENNUS_TAI_TOTEUTUS": "Bygg- eller genomförandeplanering",
-      "TYOMAAN_TAI_HANKKEEN_AIKAINEN": "Planering under bygg- eller projekttid"
-    },
     "tyomaaTyyppi": {
       "VESI": "Vatten",
       "VIEMARI": "Avlopp",
@@ -456,7 +467,6 @@
       "nimi": "Projektets namn",
       "vaihe": "Projektets Skede",
       "kuvaus": "Beskrivning av projektet",
-      "suunnitteluVaihe": "Projektets planeringsskede",
       "alkuPvm": "Projektets startdatum",
       "loppuPvm": "Projektets slutdatum",
       "tyomaaTyyppi": "Typ av byggarbetsplats",
@@ -487,9 +497,8 @@
       "onYKTHanke": "Ett gemensamt kommunaltekniskt byggarbetsplats –  ett samprojekt enligt samarbetsavtalet. Parter är utöver Helsingfors stads stadsmiljösektor också affärsverket Helsingfors stads trafikverk (HST), samkommunen Helsingforsregionens miljötjänster (HRM), Helen Oy, Helen Elnät Ab, Auris Kaasunjakelu Oy samt telenätsoperatörerna Cinia Oy, DNA Oyj, Elisa Oyj och Telia Finland Oyj. Med gemensam kommunalteknisk verksamhet strävar man efter att göra byggande i allmänna områden i städer smidigare och samordna avtalsparternas separata projekt till projekt som genomförs gemensamt för att förbättra infrastrukturtjänsternas kvalitet och tillhandahållande.",
       "alkuPvm": "Datum då projektets genomförande inleds (Obs! Genomförande på allmänt område, inte till exempel genomförande som sker på tomt)",
       "loppuPvm": "Datum då projektets genomförande avslutas (Obs! Genomförande på allmänt område, inte till exempel genomförande som sker på tomt)",
-      "vaihe": "Beskrivning av hur projektets status framskrider, uppdateras allt efter när projektet framskrider. Programmeringsskedet är inledande projektplanerings- eller förprojekteringsskede. Planeringsskedet har underskeden allt efter planeringsnivåns detaljeringsnivå. Ur tillståndsansökningsprocessens perspektiv är projektet i planeringsskede tills den får genomförandetillstånd från staden. I byggskedet har projektet fått tillstånd från staden. Haitaton hanterar inte skeden gällande tillståndsansökan, byggskede eller projektets skeden gällande färdigställande/upprätthållande/överlåtande.",
+      "vaihe": "Beskrivning av hur projektets status framskrider, uppdateras allt efter när projektet framskrider. Programmeringsskedet är inledande projektplanerings- eller förprojekteringsskede. Ur tillståndsansökningsprocessens perspektiv är projektet i planeringsskede tills den får genomförandetillstånd från staden. I byggskedet har projektet fått tillstånd från staden. Haitaton hanterar inte skeden gällande tillståndsansökan, byggskede eller projektets skeden gällande färdigställande/upprätthållande/överlåtande.",
       "kuvaus": "Beskrivning av projektets viktigaste innehåll och mål. (Obs! Genomförande på allmänt område, inte till exempel genomförande som sker på tomt)",
-      "suunnitteluVaihe": "Underskede som preciserar planeringsskedet och som uppdateras när projektet framskrider.",
       "omistajat": "Projektets ägare ansvarar för hela projektet från dess början ända till dess slut/färdigställande/överlåtelse.",
       "arvioijat": "Projektets analyserare eller bedömare kan vara projektets ägare eller någon annan part som ägaren befullmäktigat (till exempel en extern projekterarkonsult eller entreprenör).",
       "toteuttajat": "Den som ansvarar för projektets genomförande kan vara projektets ägare eller någon annan part som ägaren befullmäktigat (till exempel en extern entreprenör).",
@@ -647,7 +656,6 @@
     "liikennehaittaindeksi": "Trafikolägenhetsindex",
     "ruuhkautuminen": "Köbildning",
     "pyorailynPaareitti": "Huvudled för cykeltrafik",
-    "merkittavatJoukkoliikennereitit": "Viktiga leder för kollektivtrafik",
     "kiertoreittitarve": "Behov av omväg",
     "KIERTOREITTITARPEET": {
       "TODENNAKOINEN": "sannolik",
@@ -759,7 +767,6 @@
     "labels": {
       "kuvaus": "Beskrivning av projektet",
       "hankeVaihe": "Projektets skede",
-      "suunnitteluVaihe": "Planeringsskede",
       "katuosoite": "Gatuadress",
       "avaaKartalla": "Öppna på karta",
       "hankkeenKesto": "Projektets varaktighet",
@@ -814,6 +821,48 @@
       "toLastPage": "Till listans sista sida"
     }
   },
+  "hankeUsers": {
+    "accessRights": "Användningsrättigheter",
+    "manageRights": "Hantering av användningsrättigheter",
+    "accessRightLevels": {
+      "KAIKKI_OIKEUDET": "Alla rättigheter",
+      "KAIKKIEN_MUOKKAUS": "Ändringar i projekt och ansökningar",
+      "HANKEMUOKKAUS": "Ändring i projekt",
+      "HAKEMUSASIOINTI": "Ansökningsärende",
+      "KATSELUOIKEUS": "Visningsrätt"
+    },
+    "accessRightsInfo": {
+      "heading": "Vad kan man göra med olika rättigheter?",
+      "KAIKKI_OIKEUDET": "<strong>Alla rättigheter</strong> ger möjlighet att göra ändringar i projektets och dess ansökningars innehåll, att göra ändringar i alla användningsrättigheter och att ta bort projektet, om projektet inte har ansökningar som beslut fattats om.",
+      "KAIKKIEN_MUOKKAUS": "<strong>Rätt att göra ändringar i projektet och ansökningar</strong> ger möjlighet att ändra och skapa innehåll i projektet och dess ansökningar samt att göra ändringar i andras användningsrättigheter, förutom ”Alla rättigheter”, som ger möjlighet att ta bort projektet.",
+      "HANKEMUOKKAUS": "<strong>Rätt att göra ändringar i projekt</strong> ger möjlighet att ändra uppgifter om projektet, men inte att göra ändringar i användningsrättigheterna. Personen har då visningsrättigheter för ansökningsuppgifterna.",
+      "HAKEMUSASIOINTI": "<strong>Rätt att uträtta ärenden i projekt</strong> ger möjlighet att skapa nya ansökningar för projektet och att ändra uppgifterna i projektets ansökningar.",
+      "KATSELUOIKEUS": "<strong>Visningsrätt</strong> ger möjlighet att se uppgifter om projektet och dess ansökningar. Alla som lagts till i projektet och ansökan får automatiskt visningsrättigheter.",
+      "modifyInfo": "Du kan byta användningsrättighet genom att välja i rullgardinsmenyn och klicka på Spara. Du kan också skicka en ny inbjudningslänk till Haitaton till personen, om hen inte fått den tidigare."
+    },
+    "search": {
+      "placeholder": "t.ex. Matti Meikäläinen",
+      "helperText": "Sök enligt namn"
+    },
+    "notifications": {
+      "rightsUpdatedSuccessLabel": "Användningsrättigheterna har uppdaterats",
+      "rightsUpdatedSuccessText": "Användningsrättigheterna har uppdaterats",
+      "rightsUpdatedErrorLabel": "Ett fel uppstod vid uppdateringen",
+      "rightsUpdatedErrorText": "<0>Ett fel uppstod när användningsrättigheterna skulle uppdateras. Försök igen senare eller kontakta Haitatons tekniska support med e-post till <1>haitatontuki@hel.fi</1>.</0>",
+      "userIdentifiedLabel": "Identifieringen lyckades",
+      "userIdentifiedText": "Identifieringen lyckades. Du har nu lagts till i projektet ({{hankeNimi}} {{hankeTunnus}}).",
+      "userIdentifiedError": "Identifieringen misslyckades",
+      "invitationSentSuccessLabel": "Inbjudningslänken skickades",
+      "invitationSentSuccessText": "Inbjudningslänken skickades till {{email}}.",
+      "invitationSentErrorLabel": "Ett fel uppstod när länken skulle skickas",
+      "invitationSentErrorText": "<0>Ett fel uppstod när inbjudningslänken skulle skickas. Försök igen senare eller kontakta Haitatons tekniska support med e-post till <1>haitatontuki@hel.fi</1>.</0>"
+    },
+    "buttons": {
+      "resendInvitation": "Skicka inbjudningslänken på nytt",
+      "invitationSent": "Inbjudningslänken skickades"
+    },
+    "userIdentified": "Användaren har identifierat sig"
+  },
   "map": {
     "controls": {
       "ariaLayerMenu": "Val av kartlager"
@@ -841,6 +890,8 @@
   "staticPages": {
     "infoPage": {
       "title": "Information om Haitaton",
+      "releaseInfo": "Uppgifter om publicering",
+      "releaseVer1": "Version JS.01 publicerad 19.6.2023: Utförande av ledningsutredning",
       "materials": "Material",
       "mapMaterials": "Kartmaterial",
       "imageCopyrights": "Författarinformation till bilderna"
diff --git a/src/testUtils/render.tsx b/src/testUtils/render.tsx
index 9b6de9c81..30d075783 100644
--- a/src/testUtils/render.tsx
+++ b/src/testUtils/render.tsx
@@ -44,6 +44,7 @@ const AllTheProviders = ({ children }: Props) => {
 
 const customRender = (ui: React.ReactElement, options: RenderOptions = {}, route = '/') => {
   window.history.pushState({}, 'Test page', route);
+  window.scrollTo = function () {};
   return {
     user: userEvent.setup(),
     ...render(ui, {
diff --git a/yarn.lock b/yarn.lock
index cdf967e3d..29c5d3cf0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14252,16 +14252,16 @@ react-helmet@^6.1.0:
     react-fast-compare "^3.1.1"
     react-side-effect "^2.1.0"
 
-react-hook-form@^7.35.0:
-  version "7.35.0"
-  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.35.0.tgz#b133de48fc84b1e62f9277ba79dfbacd9bb13dd3"
-  integrity sha512-9CYdOed+Itbiu5VMVxW0PK9mBR3f0gDGJcZEyUSm0eJbDymQ913TRs2gHcQZZmfTC+rtxyDFRuelMxx/+xwMcw==
-
 react-hook-form@^7.43.3:
   version "7.43.9"
   resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.43.9.tgz#84b56ac2f38f8e946c6032ccb760e13a1037c66d"
   integrity sha512-AUDN3Pz2NSeoxQ7Hs6OhQhDr6gtF9YRuutGDwPQqhSUAHJSgGl2VeY3qN19MG0SucpjgDiuMJ4iC5T5uB+eaNQ==
 
+react-hook-form@^7.47.0:
+  version "7.47.0"
+  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.47.0.tgz#a42f07266bd297ddf1f914f08f4b5f9783262f31"
+  integrity sha512-F/TroLjTICipmHeFlMrLtNLceO2xr1jU3CyiNla5zdwsGUGu2UOxxR4UyJgLlhMwLW/Wzp4cpJ7CPfgJIeKdSg==
+
 react-i18next@^12.0.0:
   version "12.0.0"
   resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-12.0.0.tgz#634015a2c035779c5736ae4c2e5c34c1659753b1"