From ce52e2d0b38716987b3bbafdb86dd9a4bc2fbd53 Mon Sep 17 00:00:00 2001
From: Pe5h4 <pesekf@email.cz>
Date: Wed, 14 Dec 2022 15:28:12 +0100
Subject: [PATCH 01/19] Version bump

---
 asab-webui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/asab-webui b/asab-webui
index e7c9b7eb..607f76d7 160000
--- a/asab-webui
+++ b/asab-webui
@@ -1 +1 @@
-Subproject commit e7c9b7eb60eaba9cae39ea18d569301dcc7500c4
+Subproject commit 607f76d7ed2658f15e2f71190023072b864dd34e

From 86e7eb7b62b101d21d2904d25b45405a17d00336 Mon Sep 17 00:00:00 2001
From: Pe5h4 <pesekf@email.cz>
Date: Wed, 14 Dec 2022 15:30:08 +0100
Subject: [PATCH 02/19] WIP create invitation for registration

---
 .../credentials/CredentialsCreateContainer.js | 158 ++++++++++++++----
 1 file changed, 121 insertions(+), 37 deletions(-)

diff --git a/src/modules/auth/credentials/CredentialsCreateContainer.js b/src/modules/auth/credentials/CredentialsCreateContainer.js
index 358da475..31cbe5b3 100644
--- a/src/modules/auth/credentials/CredentialsCreateContainer.js
+++ b/src/modules/auth/credentials/CredentialsCreateContainer.js
@@ -3,6 +3,7 @@ import { useSelector } from 'react-redux';
 import { useParams, Link } from 'react-router-dom';
 import { useForm } from "react-hook-form";
 import { useTranslation } from 'react-i18next';
+import classnames from 'classnames';
 
 import { ButtonWithAuthz } from 'asab-webui';
 
@@ -10,6 +11,8 @@ import {
 	Container, Row, Col,
 	Card, CardHeader, CardFooter, CardBody,
 	Form, FormGroup, Input, Label,
+	Nav, NavLink, NavItem, ButtonGroup,
+	TabPane, TabContent
 } from 'reactstrap';
 
 import {
@@ -26,7 +29,7 @@ function CredentialsCreateContainer(props) {
 	let SeaCatAuthAPI = props.app.axiosCreate('seacat_auth');
 	const { t, i18n } = useTranslation();
 
-	const { handleSubmit, register, formState: { errors }, getValues, setValue, resetField } = useForm({
+	const { handleSubmit, register, formState: { errors }, getValues, setValue, reset, resetField } = useForm({
 		defaultValues: {
 			'passwordlink': true,
 		}
@@ -35,8 +38,11 @@ function CredentialsCreateContainer(props) {
 	const [provider, setProvider] = useState(undefined);
 	const [config, setConfig] = useState(undefined);
 
+	const [activeTab, setActiveTab] = useState('create');
+
 	const resourceCreateCredentials = "authz:tenant:admin";
 	const resources = useSelector(state => state.auth?.resources);
+	const tenant = useSelector(state => state.tenant?.current);
 
 	useEffect(() => {
 		retrieveProviders();
@@ -75,8 +81,8 @@ function CredentialsCreateContainer(props) {
 
 
 	// Process credentials creation on submit
-	const onSubmit = async (values) => {
-	// Provider-specific data retention
+	const onCreate = async (values) => {
+		// Provider-specific data retention
 		let providerInfo = providers[provider];
 		if (values.username === undefined){
 			values["username"] = values.email
@@ -123,6 +129,44 @@ function CredentialsCreateContainer(props) {
 		}
 	}
 
+	const onInvite = async (values) => {
+		// TODO: remove console.log
+		console.log(values, "VALUES on invite")
+
+		let body = {};
+		let credentials = {};
+		let expiration = 999999999; // TODO: enable to set expiration by user and use differerent default
+
+		Promise.all(Object.keys(values).map((key, i) => {
+			if ((values[key] != undefined) && (values[key].length != 0)) {
+				credentials[key] = values[key];
+			}
+		}))
+
+		body["credentials"] = credentials;
+		body["expiration"] = expiration;
+
+		// TODO: remove console.log
+		console.log(body, "BODY")
+
+		let response;
+		try {
+			response = await SeaCatAuthAPI.post(`/${tenant}/invite`,
+				body,
+				{
+					headers: {
+						'Content-Type': 'application/json'
+					}
+				});
+			props.app.addAlert("success", t("CredentialsCreateContainer|Invitation have been sent successfully"));
+			// Navigate to a newly created credentials
+			props.history.push(`/auth/credentials/${response.data.credentials_id}`);
+		} catch(e) {
+			console.error(e);
+			props.app.addAlert("warning", t("CredentialsCreateContainer|Something went wrong, failed to send invitation"));
+		}
+	}
+
 	const changeProvider = (value) => {
 		resetField("username");
 		resetField("phone");
@@ -133,60 +177,100 @@ function CredentialsCreateContainer(props) {
 		setProvider(value);
 	}
 
+	// Swith between the tabs
+	const toggle = (tab) => {
+		if(activeTab !== tab) {
+			reset({});
+			setActiveTab(tab);
+		}
+	}
+
 	return (
 		<Container>
 			<Row className="justify-content-md-center">
 				<Col md={8}>
-					<Form onSubmit={handleSubmit(onSubmit)}>
+					<Form onSubmit={activeTab == "create" ? handleSubmit(onCreate) : handleSubmit(onInvite)}>
 						<Card>
 							<CardHeader className="border-bottom">
 								<div className='card-header-title'>
 									<i className="cil-people pr-2"></i>
 									{t('CredentialsCreateContainer|Create new credentials')}
 								</div>
+								<ButtonGroup className="p-1">
+									<Nav tabs>
+										<NavItem>
+											<NavLink
+												className={classnames({ active: activeTab === 'create' })}
+												onClick={() => { toggle('create'); }}
+											>
+												{t('CredentialsCreateContainer|Create')}
+											</NavLink>
+										</NavItem>
+										<NavItem>
+											<NavLink
+												className={classnames({ active: activeTab === 'invite' })}
+												onClick={() => { toggle('invite'); }}
+											>
+												{t('CredentialsCreateContainer|Invite')}
+											</NavLink>
+										</NavItem>
+									</Nav>
+								</ButtonGroup>
 							</CardHeader>
+							<TabContent style={{border: "none"}} activeTab={activeTab}>
+								<TabPane tabId="create">
+									<CardBody>
 
-							<CardBody>
-
-								{Object.keys(providers).length > 1 &&
-									<FormGroup>
-										<Label for="provider">{t('CredentialsCreateContainer|Provider')}</Label>
-											<Input
-												id="provider"
-												type="select"
-												name="provider"
-												value={provider}
-												onChange={e => changeProvider(e.target.value)}
-											>
-											{Object.keys(providers).map((key, index) => (
-												<option key={index} value={key}>{providers[key]._provider_id} ({providers[key]._type == 'm2m' ? "Machine-to-Machine" : "Human"})</option>
-											))}
-											</Input>
-									</FormGroup>
-								}
-
-								{config !== undefined && config.creation.map((item, idx) => {
-									switch(item.type) {
-										case 'username': return(<UserNameField key={idx} register={register} config={item} getValues={getValues} errors={errors} required={item.policy === "required"} />)
-										case 'email': return(<EmailField key={idx} register={register} config={item} getValues={getValues} errors={errors} required={item.policy === "required"} />)
-										case 'password': return(<PasswordField key={idx} register={register} config={item} getValues={getValues} errors={errors} />)
-										case 'phone': return(<PhoneField key={idx} register={register} config={item} getValues={getValues} setValue={setValue} errors={errors} required={item.policy === "required"} />)
-										case 'passwordlink': return(<PasswordLinkField key={idx} register={register} config={item} getValues={getValues} errors={errors}/>)
-										default: return(<div key={idx}>Unknown item: "{item.type}"</div>)
-									}
-								})}
-
-							</CardBody>
+										{Object.keys(providers).length > 1 &&
+											<FormGroup>
+												<Label for="provider">{t('CredentialsCreateContainer|Provider')}</Label>
+													<Input
+														id="provider"
+														type="select"
+														name="provider"
+														value={provider}
+														onChange={e => changeProvider(e.target.value)}
+													>
+													{Object.keys(providers).map((key, index) => (
+														<option key={index} value={key}>{providers[key]._provider_id} ({providers[key]._type == 'm2m' ? "Machine-to-Machine" : "Human"})</option>
+													))}
+													</Input>
+											</FormGroup>
+										}
+
+										{(activeTab == "create") && (config !== undefined) && config.creation.map((item, idx) => {
+											switch(item.type) {
+												case 'username': return(<UserNameField key={idx} register={register} config={item} getValues={getValues} errors={errors} required={item.policy === "required"} />)
+												case 'email': return(<EmailField key={idx} register={register} config={item} getValues={getValues} errors={errors} required={item.policy === "required"} />)
+												case 'password': return(<PasswordField key={idx} register={register} config={item} getValues={getValues} errors={errors} />)
+												case 'phone': return(<PhoneField key={idx} register={register} config={item} getValues={getValues} setValue={setValue} errors={errors} required={item.policy === "required"} />)
+												case 'passwordlink': return(<PasswordLinkField key={idx} register={register} config={item} getValues={getValues} errors={errors}/>)
+												default: return(<div key={idx}>Unknown item: "{item.type}"</div>)
+											}
+										})}
 
+									</CardBody>
+								</TabPane>
+								<TabPane tabId="invite">
+									<CardBody>
+										{(activeTab == "invite") &&
+										<>
+											<EmailField register={register} getValues={getValues} errors={errors} required={true} />
+											<UserNameField register={register} getValues={getValues} errors={errors} required={false} />
+											<PhoneField register={register} getValues={getValues} setValue={setValue} errors={errors} required={false} />
+										</>}
+									</CardBody>
+								</TabPane>
+							</TabContent>
 							<CardFooter>
 								<ButtonWithAuthz
 									color="primary"
 									type="submit"
-									disabled={provider === undefined}
+									disabled={(activeTab == "create") && (provider == undefined)}
 									resource={resourceCreateCredentials}
 									resources={resources}
 								>
-									{t('CredentialsCreateContainer|Create credentials')}
+									{activeTab == "create" ? t('CredentialsCreateContainer|Create credentials') : t('CredentialsCreateContainer|Invite')}
 								</ButtonWithAuthz>
 							</CardFooter>
 						</Card>

From 9e799c5e447f136b1f0affaa160417ed29a773f9 Mon Sep 17 00:00:00 2001
From: Pe5h4 <pesekf@email.cz>
Date: Wed, 14 Dec 2022 15:30:45 +0100
Subject: [PATCH 03/19] Update username formfields

---
 src/modules/auth/credentials/FormFields.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/auth/credentials/FormFields.js b/src/modules/auth/credentials/FormFields.js
index d3b871d4..50a6eb54 100644
--- a/src/modules/auth/credentials/FormFields.js
+++ b/src/modules/auth/credentials/FormFields.js
@@ -95,9 +95,9 @@ export function UserNameField(props) {
 		"username",
 		{
 			validate: {
-				emptyInput: value => (value && value.toString().length !== 0) || t("FormFields|Username cannot be empty!"),
+				emptyInput: value => (value && value.toString().length !== 0) || (props.required == false) || t("FormFields|Username cannot be empty!"),
 				startWithNumber: value => !(/^\d/).test(value) || t("FormFields|Invalid format, username cannot start with a number"),
-				vlidation: value => (/^[a-z_][a-z0-9_-]{0,31}$/).test(value) || t("FormFields|Invalid format, only lower-case letters, numbers, dash and underscore are allowed"),
+				validation: value => (/^[a-z_][a-z0-9_-]{0,31}$|^$/).test(value) || t("FormFields|Invalid format, only lower-case letters, numbers, dash and underscore are allowed"),
 			}
 		}
 	);

From 919b144ae9d8aeaf3ec0b5a629e6fd01333c42c1 Mon Sep 17 00:00:00 2001
From: Pe5h4 <pesekf@email.cz>
Date: Wed, 14 Dec 2022 16:10:19 +0100
Subject: [PATCH 04/19] WIP implementation of resend invitation

---
 .../credentials/CredentialsDetailContainer.js | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/modules/auth/credentials/CredentialsDetailContainer.js b/src/modules/auth/credentials/CredentialsDetailContainer.js
index bba0e034..d6549053 100644
--- a/src/modules/auth/credentials/CredentialsDetailContainer.js
+++ b/src/modules/auth/credentials/CredentialsDetailContainer.js
@@ -137,7 +137,7 @@ function CredentialsDetailContainer(props) {
 		}
 	}
 
-
+	// Suspend user
 	const suspendUser = async (suspend) => {
 		if (suspended === false || suspended === undefined) {
 			setSuspended(true);
@@ -162,10 +162,29 @@ function CredentialsDetailContainer(props) {
 		}
 	}
 
+	// Reset password
 	const resetPwd = () => {
 		props.history.push(`/auth/credentials/${credentials_id}/passwordreset`);
 	}
 
+	// Resend invitation
+	const resendInvitation = async () => {
+		// TODO: what should be in the body??
+		try {
+			let response = await SeaCatAuthAPI.post(`/invite/${credentials_id}`,
+				{},
+				{ headers:
+					{
+						'Content-Type': 'application/json'
+					}
+				});
+			props.app.addAlert("success", t('CredentialsDetailContainer|Invitation has been send successfully'));
+		} catch(e) {
+			console.error(e);
+			props.app.addAlert("warning", t('CredentialsDetailContainer|Something went wrong, failed to resend invitation'));
+		}
+	}
+
 	return (
 		<Container fluid className="credential-detail-wrapper">
 			<div className="credential-detail-info-wrapper credential-detail-info-area">
@@ -250,6 +269,14 @@ function CredentialsDetailContainer(props) {
 								>
 									{t('CredentialsDetailContainer|Reset password')}
 								</ButtonWithAuthz>
+								<ButtonWithAuthz
+									color="outline-primary"
+									resource={resources}
+									resources={resources}
+									onClick={() => { resendInvitation() }}
+								>
+									{t('CredentialsDetailContainer|Resend invitation')}
+								</ButtonWithAuthz>
 							</ButtonGroup>
 						</CardFooter>
 

From cd43727ef285d6d05af9268c71879a1604017044 Mon Sep 17 00:00:00 2001
From: Pe5h4 <pesekf@email.cz>
Date: Tue, 20 Dec 2022 15:41:08 +0100
Subject: [PATCH 05/19] Add option to display translations with colons

---
 src/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/index.js b/src/index.js
index f1e0c0a8..e8776d78 100644
--- a/src/index.js
+++ b/src/index.js
@@ -41,6 +41,7 @@ let ConfigDefaults = {
 		fallbackLng: 'en',
 		supportedLngs: ['en', 'cs'],
 		debug: false,
+		nsSeparator: false
 	}
 };
 

From ebc2d255bdc1609f8bd541bc88719b66c1ec1b9e Mon Sep 17 00:00:00 2001
From: Pe5h4 <pesekf@email.cz>
Date: Tue, 20 Dec 2022 15:41:45 +0100
Subject: [PATCH 06/19] Add wider alert message

---
 src/modules/auth/credentials/CredentialsCreateContainer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/auth/credentials/CredentialsCreateContainer.js b/src/modules/auth/credentials/CredentialsCreateContainer.js
index 31cbe5b3..e5bc74be 100644
--- a/src/modules/auth/credentials/CredentialsCreateContainer.js
+++ b/src/modules/auth/credentials/CredentialsCreateContainer.js
@@ -163,7 +163,7 @@ function CredentialsCreateContainer(props) {
 			props.history.push(`/auth/credentials/${response.data.credentials_id}`);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsCreateContainer|Something went wrong, failed to send invitation"));
+			props.app.addAlert("warning", t(`CredentialsCreateContainer|Something went wrong, failed to send invitation: ${e?.response?.data?.message}`));
 		}
 	}
 

From 0a5d753b25cc46853b96f8cce4d99c73e8cb51ec Mon Sep 17 00:00:00 2001
From: Pe5h4 <pesekf@email.cz>
Date: Tue, 20 Dec 2022 15:42:44 +0100
Subject: [PATCH 07/19] Refactor resend invite

---
 .../credentials/CredentialsDetailContainer.js | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/modules/auth/credentials/CredentialsDetailContainer.js b/src/modules/auth/credentials/CredentialsDetailContainer.js
index d6549053..f9fd99d6 100644
--- a/src/modules/auth/credentials/CredentialsDetailContainer.js
+++ b/src/modules/auth/credentials/CredentialsDetailContainer.js
@@ -221,6 +221,17 @@ function CredentialsDetailContainer(props) {
 										<span className="credential-status credential-suspended-status">{t('CredentialsDetailContainer|Suspended')}</span>
 									}
 									<br />
+									{(data?.registered == false) ?
+									<ButtonWithAuthz
+										style={{padding: 0, borderWidth: 0, marginTop: "8px"}}
+										onClick={() => { resendInvitation() }}
+										color="link"
+										resource={resourceManageCredentials}
+										resources={resources}
+									>
+										{t('CredentialsDetailContainer|Resend invitation')}
+									</ButtonWithAuthz>
+									:
 									<ButtonWithAuthz
 										style={{padding: 0, borderWidth: 0, marginTop: "8px"}}
 										onClick={(e) => { e.preventDefault(); suspendUserForm((suspended === false) || (suspended === undefined)) }}
@@ -234,6 +245,7 @@ function CredentialsDetailContainer(props) {
 											t('CredentialsDetailContainer|Activate user')
 										}
 									</ButtonWithAuthz>
+									}
 								</Col>
 							</Row>
 
@@ -269,14 +281,6 @@ function CredentialsDetailContainer(props) {
 								>
 									{t('CredentialsDetailContainer|Reset password')}
 								</ButtonWithAuthz>
-								<ButtonWithAuthz
-									color="outline-primary"
-									resource={resources}
-									resources={resources}
-									onClick={() => { resendInvitation() }}
-								>
-									{t('CredentialsDetailContainer|Resend invitation')}
-								</ButtonWithAuthz>
 							</ButtonGroup>
 						</CardFooter>
 

From d5f01ce5ccfc873b7ea7cc2ca6d6da1cf8e3e95d Mon Sep 17 00:00:00 2001
From: Pe5h4 <pesekf@email.cz>
Date: Thu, 5 Jan 2023 16:37:50 +0100
Subject: [PATCH 08/19] Remove console.logs, add comments

---
 .../auth/credentials/CredentialsCreateContainer.js    | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/modules/auth/credentials/CredentialsCreateContainer.js b/src/modules/auth/credentials/CredentialsCreateContainer.js
index e5bc74be..9fc210ed 100644
--- a/src/modules/auth/credentials/CredentialsCreateContainer.js
+++ b/src/modules/auth/credentials/CredentialsCreateContainer.js
@@ -129,14 +129,14 @@ function CredentialsCreateContainer(props) {
 		}
 	}
 
+	// Invite user
 	const onInvite = async (values) => {
-		// TODO: remove console.log
-		console.log(values, "VALUES on invite")
-
 		let body = {};
 		let credentials = {};
-		let expiration = 999999999; // TODO: enable to set expiration by user and use differerent default
+		// TODO: Allow setting up the expiration by admin and use differerent default
+		let expiration = 999999999;
 
+		// Fill credentials key with filled values
 		Promise.all(Object.keys(values).map((key, i) => {
 			if ((values[key] != undefined) && (values[key].length != 0)) {
 				credentials[key] = values[key];
@@ -146,9 +146,6 @@ function CredentialsCreateContainer(props) {
 		body["credentials"] = credentials;
 		body["expiration"] = expiration;
 
-		// TODO: remove console.log
-		console.log(body, "BODY")
-
 		let response;
 		try {
 			response = await SeaCatAuthAPI.post(`/${tenant}/invite`,

From be330c350aa4bfee1879573d05c788a176a68b24 Mon Sep 17 00:00:00 2001
From: Pe5h4 <pesekf@email.cz>
Date: Mon, 9 Jan 2023 10:35:52 +0100
Subject: [PATCH 09/19] Update naming and colors for invited user

---
 src/modules/auth/credentials/CredentialsCreateContainer.js | 2 +-
 src/modules/auth/credentials/CredentialsDetailContainer.js | 6 ++++--
 src/modules/auth/credentials/credentials.scss              | 5 +++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/modules/auth/credentials/CredentialsCreateContainer.js b/src/modules/auth/credentials/CredentialsCreateContainer.js
index 9fc210ed..7d58bbd8 100644
--- a/src/modules/auth/credentials/CredentialsCreateContainer.js
+++ b/src/modules/auth/credentials/CredentialsCreateContainer.js
@@ -191,7 +191,7 @@ function CredentialsCreateContainer(props) {
 							<CardHeader className="border-bottom">
 								<div className='card-header-title'>
 									<i className="cil-people pr-2"></i>
-									{t('CredentialsCreateContainer|Create new credentials')}
+									{activeTab == "create" ? t('CredentialsCreateContainer|Create new credentials') : t('CredentialsCreateContainer|Invite user')}
 								</div>
 								<ButtonGroup className="p-1">
 									<Nav tabs>
diff --git a/src/modules/auth/credentials/CredentialsDetailContainer.js b/src/modules/auth/credentials/CredentialsDetailContainer.js
index f9fd99d6..c2bf1f36 100644
--- a/src/modules/auth/credentials/CredentialsDetailContainer.js
+++ b/src/modules/auth/credentials/CredentialsDetailContainer.js
@@ -215,10 +215,12 @@ function CredentialsDetailContainer(props) {
 							<Row className="card-body-row">
 								<Col sm={3} className="pr-0">{t('CredentialsDetailContainer|Status')}</Col>
 								<Col>
-									{(data.suspended === false) || (data.suspended === undefined) ?
+									{(data.suspended === false) || (data.suspended == undefined) ?
 										<span className="credential-status credential-active-status">{t('CredentialsDetailContainer|Active')}</span>
 									:
-										<span className="credential-status credential-suspended-status">{t('CredentialsDetailContainer|Suspended')}</span>
+										<span className={`credential-status ${(data?.registered == false) ? "credential-invited-status" : "credential-suspended-status"}`}>
+											{(data?.registered == false) ? t('CredentialsDetailContainer|Invited') : t('CredentialsDetailContainer|Suspended')}
+										</span>
 									}
 									<br />
 									{(data?.registered == false) ?
diff --git a/src/modules/auth/credentials/credentials.scss b/src/modules/auth/credentials/credentials.scss
index 09d97d9d..90286622 100644
--- a/src/modules/auth/credentials/credentials.scss
+++ b/src/modules/auth/credentials/credentials.scss
@@ -32,6 +32,11 @@
 	background-color: $pink;
 }
 
+.credential-invited-status {
+	color: $primary;
+	background-color: $beige-gray;
+}
+
 //CredentialsSessionCard
 .user-session {
 	color: $link-color;

From 49ada26ab85d36981c13f67cdd8a47363da7a4e3 Mon Sep 17 00:00:00 2001
From: Pe5h4 <pesekf@email.cz>
Date: Mon, 9 Jan 2023 12:23:05 +0100
Subject: [PATCH 10/19] Update locales for invitation

---
 public/locales/cs/translation.json                   | 12 +++++++++---
 public/locales/en/translation.json                   | 12 +++++++++---
 .../auth/credentials/CredentialsListContainer.js     |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/public/locales/cs/translation.json b/public/locales/cs/translation.json
index 32ac0513..49c3719f 100644
--- a/public/locales/cs/translation.json
+++ b/public/locales/cs/translation.json
@@ -146,7 +146,10 @@
 		"Create credentials": "Vytvořit údaje",
 		"Credentials have been created successfully": "Údaje byly úspěšně vytvořeny",
 		"Something went wrong, failed to create credentials": "Něco je špatně, údaje nebyly vytvořeny",
-		"Something went wrong, failed to fetch providers": "Něco je špatně, získání providerů selhalo"
+		"Something went wrong, failed to fetch providers": "Něco je špatně, získání providerů selhalo",
+		"Create": "Vytvořit",
+		"Invite": "Pozvat",
+		"Invite user": "Pozvat uživatele"
 	},
 	"CredentialsDetailContainer": {
 		"Credentials": "Uživatelské údaje",
@@ -177,7 +180,9 @@
 		"Phone number already in use": "Telefonní číslo je již použito",
 		"Email address already in use": "Emailová adresa je již použita",
 		"Something went wrong, failed to fetch provider data": "Něco je špatně, nepodařilo se získat data provideru",
-		"Information editing is not allowed within this credentials": "V rámci těchto uživatelských údajů není povolena úprava informací"
+		"Information editing is not allowed within this credentials": "V rámci těchto uživatelských údajů není povolena úprava informací",
+		"Invited": "Pozván",
+		"Resend invitation": "Přeposlat pozvánku"
 	},
 	"CredentialsRolesCard": {
 		"Assigned roles": "Přiřazené role",
@@ -220,7 +225,8 @@
 		"Tenants": "Tenanti",
 		"Roles": "Role",
 		"Something went wrong, failed to fetch data": "Něco je špatně, nepodařilo se získat data",
-		"Can't fetch the data, you don't have rights to display it": "Nepodařilo se získat data, nemáte dostatečná oprávnění k jejich zobrazení"
+		"Can't fetch the data, you don't have rights to display it": "Nepodařilo se získat data, nemáte dostatečná oprávnění k jejich zobrazení",
+		"Credentials invited": "Uživatel pozván"
 	},
 	"FormFields": {
 		"Phone": "Telefon",
diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
index f34c00f5..11f3388a 100644
--- a/public/locales/en/translation.json
+++ b/public/locales/en/translation.json
@@ -146,7 +146,10 @@
 		"Create credentials": "Create credentials",
 		"Credentials have been created successfully": "Credentials have been created successfully",
 		"Something went wrong, failed to create credentials": "Something went wrong, failed to create credentials",
-		"Something went wrong, failed to fetch providers": "Something went wrong, failed to fetch providers"
+		"Something went wrong, failed to fetch providers": "Something went wrong, failed to fetch providers",
+		"Create": "Create",
+		"Invite": "Invite",
+		"Invite user": "Invite user"
 	},
 	"CredentialsDetailContainer": {
 		"Credentials": "Credentials",
@@ -177,7 +180,9 @@
 		"Phone number already in use": "Phone number already in use",
 		"Email address already in use": "Email address already in use",
 		"Something went wrong, failed to fetch provider data": "Something went wrong, failed to fetch provider data",
-		"Information editing is not allowed within this credentials": "Information editing is not allowed within this credentials"
+		"Information editing is not allowed within this credentials": "Information editing is not allowed within this credentials",
+		"Invited": "Invited",
+		"Resend invitation": "Resend invitation"
 	},
 	"CredentialsRolesCard": {
 		"Assigned roles": "Assigned roles",
@@ -219,7 +224,8 @@
 		"Tenants": "Tenants",
 		"Roles": "Roles",
 		"Something went wrong, failed to fetch data": "Something went wrong, failed to fetch data",
-		"Can't fetch the data, you don't have rights to display it": "Can't fetch the data, you don't have rights to display it"
+		"Can't fetch the data, you don't have rights to display it": "Can't fetch the data, you don't have rights to display it",
+		"Credentials invited": "Credentials invited"
 	},
 	"FormFields": {
 		"Phone": "Phone",
diff --git a/src/modules/auth/credentials/CredentialsListContainer.js b/src/modules/auth/credentials/CredentialsListContainer.js
index 3283bb16..a7ef2719 100644
--- a/src/modules/auth/credentials/CredentialsListContainer.js
+++ b/src/modules/auth/credentials/CredentialsListContainer.js
@@ -42,7 +42,7 @@ function CredentialsListContainer(props) {
 							marginBottom: 0}}
 					>
 						{obj.suspended === true ?
-							<span className="cil-user-unfollow text-muted mr-1" title={t("CredentialsListContainer|Credentials suspended")}/>
+							<span className="cil-user-unfollow text-muted mr-1" title={(obj.registered === false) ? t("CredentialsListContainer|Credentials invited") : t("CredentialsListContainer|Credentials suspended")}/>
 							: <span className="cil-user mr-1" />}
 						<Link
 							style={{color: obj.suspended === true && '#73818f'}}

From 75084e09b20574f071a510d67aab894f41a6db48 Mon Sep 17 00:00:00 2001
From: Pe5h4 <pesekf@email.cz>
Date: Mon, 9 Jan 2023 13:07:41 +0100
Subject: [PATCH 11/19] Update locales for credentials create and credentials
 detail containers

---
 public/locales/cs/translation.json            | 12 ++++++----
 public/locales/en/translation.json            | 22 +++++++++++--------
 .../credentials/CredentialsCreateContainer.js |  9 ++++----
 .../credentials/CredentialsDetailContainer.js | 22 +++++++++----------
 4 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/public/locales/cs/translation.json b/public/locales/cs/translation.json
index 49c3719f..09f3f521 100644
--- a/public/locales/cs/translation.json
+++ b/public/locales/cs/translation.json
@@ -145,11 +145,13 @@
 		"Provider": "Provider",
 		"Create credentials": "Vytvořit údaje",
 		"Credentials have been created successfully": "Údaje byly úspěšně vytvořeny",
-		"Something went wrong, failed to create credentials": "Něco je špatně, údaje nebyly vytvořeny",
-		"Something went wrong, failed to fetch providers": "Něco je špatně, získání providerů selhalo",
+		"Something went wrong, failed to create credentials": "Něco je špatně, údaje nebyly vytvořeny: {{error}}",
+		"Something went wrong, failed to fetch providers": "Něco je špatně, získání providerů selhalo: {{error}}",
 		"Create": "Vytvořit",
 		"Invite": "Pozvat",
-		"Invite user": "Pozvat uživatele"
+		"Invite user": "Pozvat uživatele",
+		"Invitation sent successfully": "Pozvánka úspěšně odeslána",
+		"Something went wrong, failed to send invitation": "Něco je špatně, pozvánka nebyla odeslána: {{error}}"
 	},
 	"CredentialsDetailContainer": {
 		"Credentials": "Uživatelské údaje",
@@ -182,7 +184,9 @@
 		"Something went wrong, failed to fetch provider data": "Něco je špatně, nepodařilo se získat data provideru",
 		"Information editing is not allowed within this credentials": "V rámci těchto uživatelských údajů není povolena úprava informací",
 		"Invited": "Pozván",
-		"Resend invitation": "Přeposlat pozvánku"
+		"Resend invitation": "Přeposlat pozvánku",
+		"Something went wrong, failed to resend invitation": "Něco je špatně, pozvánka nebyla odeslána: {{error}}",
+		"Invitation sent successfully": "Pozvánka úspěšně odeslána"
 	},
 	"CredentialsRolesCard": {
 		"Assigned roles": "Přiřazené role",
diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
index 11f3388a..ea2bb94d 100644
--- a/public/locales/en/translation.json
+++ b/public/locales/en/translation.json
@@ -145,11 +145,13 @@
 		"Provider": "Provider",
 		"Create credentials": "Create credentials",
 		"Credentials have been created successfully": "Credentials have been created successfully",
-		"Something went wrong, failed to create credentials": "Something went wrong, failed to create credentials",
-		"Something went wrong, failed to fetch providers": "Something went wrong, failed to fetch providers",
+		"Something went wrong, failed to create credentials": "Something went wrong, failed to create credentials: {{error}}",
+		"Something went wrong, failed to fetch providers": "Something went wrong, failed to fetch providers: {{error}}",
 		"Create": "Create",
 		"Invite": "Invite",
-		"Invite user": "Invite user"
+		"Invite user": "Invite user",
+		"Invitation sent successfully": "Invitation sent successfully",
+		"Something went wrong, failed to send invitation": "Something went wrong, failed to send invitation: {{error}}"
 	},
 	"CredentialsDetailContainer": {
 		"Credentials": "Credentials",
@@ -171,18 +173,20 @@
 		"Do you want to remove this user?": "Do you want to remove this user?",
 		"Do you want to suspend this user?": "Do you want to suspend this user?",
 		"Do you want to activate this user?": "Do you want to activate this user?",
-		"Something went wrong, failed to fetch user details": "Something went wrong, failed to fetch user details",
-		"Something went wrong, failed to fetch user sessions": "Something went wrong, failed to fetch user sessions",
-		"Something went wrong, failed to remove user": "Something went wrong, failed to remove user",
+		"Something went wrong, failed to fetch user details": "Something went wrong, failed to fetch user details: {{error}}",
+		"Something went wrong, failed to fetch user sessions": "Something went wrong, failed to fetch user sessions: {{error}}",
+		"Something went wrong, failed to remove user": "Something went wrong, failed to remove user: {{error}}",
 		"User removed successfully": "User removed successfully",
-		"Something went wrong, failed to update user": "Something went wrong, failed to update user",
+		"Something went wrong, failed to update user": "Something went wrong, failed to update user: {{error}}",
 		"User has been updated successfully": "User has been updated successfully",
 		"Phone number already in use": "Phone number already in use",
 		"Email address already in use": "Email address already in use",
-		"Something went wrong, failed to fetch provider data": "Something went wrong, failed to fetch provider data",
+		"Something went wrong, failed to fetch provider data": "Something went wrong, failed to fetch provider data: {{error}}",
 		"Information editing is not allowed within this credentials": "Information editing is not allowed within this credentials",
 		"Invited": "Invited",
-		"Resend invitation": "Resend invitation"
+		"Resend invitation": "Resend invitation",
+		"Something went wrong, failed to resend invitation": "Something went wrong, failed to resend invitation: {{error}}",
+		"Invitation sent successfully": "Invitation sent successfully"
 	},
 	"CredentialsRolesCard": {
 		"Assigned roles": "Assigned roles",
diff --git a/src/modules/auth/credentials/CredentialsCreateContainer.js b/src/modules/auth/credentials/CredentialsCreateContainer.js
index 7d58bbd8..ca7861d7 100644
--- a/src/modules/auth/credentials/CredentialsCreateContainer.js
+++ b/src/modules/auth/credentials/CredentialsCreateContainer.js
@@ -74,12 +74,11 @@ function CredentialsCreateContainer(props) {
 			setProviders(reg_conf);
 		} catch (e) {
 			console.error("Failed to retrieve providers from server: ", e);
-			props.app.addAlert("warning", t("CredentialsCreateContainer|Something went wrong, failed to fetch providers"));
+			props.app.addAlert("warning", t("CredentialsCreateContainer|Something went wrong, failed to fetch providers", {error: e?.response?.data?.message}), 30);
 		}
 	};
 
 
-
 	// Process credentials creation on submit
 	const onCreate = async (values) => {
 		// Provider-specific data retention
@@ -125,7 +124,7 @@ function CredentialsCreateContainer(props) {
 			props.history.push("/auth/credentials/" + response.data._id);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsCreateContainer|Something went wrong, failed to create credentials"));
+			props.app.addAlert("warning", t("CredentialsCreateContainer|Something went wrong, failed to create credentials", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
@@ -155,12 +154,12 @@ function CredentialsCreateContainer(props) {
 						'Content-Type': 'application/json'
 					}
 				});
-			props.app.addAlert("success", t("CredentialsCreateContainer|Invitation have been sent successfully"));
+			props.app.addAlert("success", t("CredentialsCreateContainer|Invitation sent successfully"));
 			// Navigate to a newly created credentials
 			props.history.push(`/auth/credentials/${response.data.credentials_id}`);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t(`CredentialsCreateContainer|Something went wrong, failed to send invitation: ${e?.response?.data?.message}`));
+			props.app.addAlert("warning", t("CredentialsCreateContainer|Something went wrong, failed to send invitation", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
diff --git a/src/modules/auth/credentials/CredentialsDetailContainer.js b/src/modules/auth/credentials/CredentialsDetailContainer.js
index c2bf1f36..2dd80f13 100644
--- a/src/modules/auth/credentials/CredentialsDetailContainer.js
+++ b/src/modules/auth/credentials/CredentialsDetailContainer.js
@@ -69,7 +69,7 @@ function CredentialsDetailContainer(props) {
 			setLoadingCustomData(false);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsDetailContainer|Something went wrong, failed to fetch user details"));
+			props.app.addAlert("warning", t("CredentialsDetailContainer|Something went wrong, failed to fetch user details", {error: e?.response?.data?.message}), 30);
 		}
 	};
 
@@ -85,7 +85,7 @@ function CredentialsDetailContainer(props) {
 			}
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsDetailContainer|Something went wrong, failed to fetch provider data"));
+			props.app.addAlert("warning", t("CredentialsDetailContainer|Something went wrong, failed to fetch provider data", {error: e?.response?.data?.message}), 30);
 		}
 	};
 
@@ -97,7 +97,7 @@ function CredentialsDetailContainer(props) {
 			setSessions(response.data.data);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("SessionListContainer|Something went wrong, failed to fetch user sessions"));
+			props.app.addAlert("warning", t("SessionListContainer|Something went wrong, failed to fetch user sessions", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
@@ -119,7 +119,7 @@ function CredentialsDetailContainer(props) {
 			props.history.push("/auth/credentials");
 		} catch(e) {
 			console.error(e); // log the error to the browser's console
-			props.app.addAlert("warning", t('CredentialsDetailContainer|Something went wrong, failed to remove user'));
+			props.app.addAlert("warning", t('CredentialsDetailContainer|Something went wrong, failed to remove user', {error: e?.response?.data?.message}), 30);
 		}
 	};
 
@@ -158,7 +158,7 @@ function CredentialsDetailContainer(props) {
 			retrieveData();
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t('CredentialsDetailContainer|Something went wrong, failed to update user'));
+			props.app.addAlert("warning", t('CredentialsDetailContainer|Something went wrong, failed to update user', {error: e?.response?.data?.message}), 30);
 		}
 	}
 
@@ -169,7 +169,7 @@ function CredentialsDetailContainer(props) {
 
 	// Resend invitation
 	const resendInvitation = async () => {
-		// TODO: what should be in the body??
+		// Body should be empty
 		try {
 			let response = await SeaCatAuthAPI.post(`/invite/${credentials_id}`,
 				{},
@@ -178,10 +178,10 @@ function CredentialsDetailContainer(props) {
 						'Content-Type': 'application/json'
 					}
 				});
-			props.app.addAlert("success", t('CredentialsDetailContainer|Invitation has been send successfully'));
+			props.app.addAlert("success", t('CredentialsDetailContainer|Invitation sent successfully'));
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t('CredentialsDetailContainer|Something went wrong, failed to resend invitation'));
+			props.app.addAlert("warning", t('CredentialsDetailContainer|Something went wrong, failed to resend invitation', {error: e?.response?.data?.message}), 30);
 		}
 	}
 
@@ -444,16 +444,16 @@ function CredentialsInfoCard(props) {
 			if (e.response.status === 400) {
 				if (e.response.data.result.key === "phone" && e.response.data.result.error === "ALREADY-IN-USE") {
 					console.error(t("CredentialsDetailContainer|Phone number already in use"));
-					props.app.addAlert("warning", t("CredentialsDetailContainer|Phone number already in use"));
+					props.app.addAlert("warning", t("CredentialsDetailContainer|Phone number already in use"), 30);
 					return;
 				} else if (e.response.data.result.key === "email" && e.response.data.result.error === "ALREADY-IN-USE") {
 					console.error(t("CredentialsDetailContainer|Email address already in use"));
-					props.app.addAlert("warning", t("CredentialsDetailContainer|Email address already in use"));
+					props.app.addAlert("warning", t("CredentialsDetailContainer|Email address already in use"), 30);
 					return;
 				}
 			}
 			console.error(e);
-			props.app.addAlert("warning", t('CredentialsDetailContainer|Something went wrong, failed to update user'));
+			props.app.addAlert("warning", t('CredentialsDetailContainer|Something went wrong, failed to update user', {error: e?.response?.data?.message}), 30);
 			return;
 		}
 	}

From a6fd401e2f1b21d0eda9db47572d7a04890c7610 Mon Sep 17 00:00:00 2001
From: Pe5h4 <pesekf@email.cz>
Date: Mon, 9 Jan 2023 13:32:46 +0100
Subject: [PATCH 12/19] Update locales for credentialslist container

---
 public/locales/cs/translation.json                       | 2 +-
 public/locales/en/translation.json                       | 2 +-
 src/modules/auth/credentials/CredentialsListContainer.js | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/locales/cs/translation.json b/public/locales/cs/translation.json
index 09f3f521..7515774c 100644
--- a/public/locales/cs/translation.json
+++ b/public/locales/cs/translation.json
@@ -228,7 +228,7 @@
 		"Search": "Hledat",
 		"Tenants": "Tenanti",
 		"Roles": "Role",
-		"Something went wrong, failed to fetch data": "Něco je špatně, nepodařilo se získat data",
+		"Something went wrong, failed to fetch data": "Něco je špatně, nepodařilo se získat data: {{error}}",
 		"Can't fetch the data, you don't have rights to display it": "Nepodařilo se získat data, nemáte dostatečná oprávnění k jejich zobrazení",
 		"Credentials invited": "Uživatel pozván"
 	},
diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
index ea2bb94d..d0cf69ac 100644
--- a/public/locales/en/translation.json
+++ b/public/locales/en/translation.json
@@ -227,7 +227,7 @@
 		"Search": "Search",
 		"Tenants": "Tenants",
 		"Roles": "Roles",
-		"Something went wrong, failed to fetch data": "Something went wrong, failed to fetch data",
+		"Something went wrong, failed to fetch data": "Something went wrong, failed to fetch data: {{error}}",
 		"Can't fetch the data, you don't have rights to display it": "Can't fetch the data, you don't have rights to display it",
 		"Credentials invited": "Credentials invited"
 	},
diff --git a/src/modules/auth/credentials/CredentialsListContainer.js b/src/modules/auth/credentials/CredentialsListContainer.js
index a7ef2719..6c04b115 100644
--- a/src/modules/auth/credentials/CredentialsListContainer.js
+++ b/src/modules/auth/credentials/CredentialsListContainer.js
@@ -160,10 +160,10 @@ function CredentialsListContainer(props) {
 			console.error(e);
 			setLoading(false);
 			if (e.response.status === 401) {
-				props.app.addAlert("warning", t("CredentialsListContainer|Can't fetch the data, you don't have rights to display it"));
+				props.app.addAlert("warning", t("CredentialsListContainer|Can't fetch the data, you don't have rights to display it"), 30);
 				return;
 			}
-			props.app.addAlert("warning", t("CredentialsListContainer|Something went wrong, failed to fetch data"));
+			props.app.addAlert("warning", t("CredentialsListContainer|Something went wrong, failed to fetch data", {error: e?.response?.data?.message}), 30);
 		}
 	};
 
@@ -179,7 +179,7 @@ function CredentialsListContainer(props) {
 
 		} catch (e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsListContainer|Something went wrong, failed to fetch data"));
+			props.app.addAlert("warning", t("CredentialsListContainer|Something went wrong, failed to fetch data", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
@@ -195,7 +195,7 @@ function CredentialsListContainer(props) {
 
 		} catch (e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsListContainer|Something went wrong, failed to fetch data"));
+			props.app.addAlert("warning", t("CredentialsListContainer|Something went wrong, failed to fetch data", {error: e?.response?.data?.message}), 30);
 		}
 	}
 

From 5e30e5f9e1ced9a1bf4d679606d0aef05ae48693 Mon Sep 17 00:00:00 2001
From: Pe5h4 <pesekf@email.cz>
Date: Tue, 10 Jan 2023 13:13:36 +0100
Subject: [PATCH 13/19] Update locales for error messages

---
 public/locales/cs/translation.json            | 115 +++++++++---------
 public/locales/en/translation.json            | 114 +++++++++--------
 .../auth/clients/ClientCreateContainer.js     |   4 +-
 .../auth/clients/ClientDetailContainer.js     |   8 +-
 .../auth/clients/ClientListContainer.js       |   2 +-
 .../auth/components/CustomDataContainer.js    |   2 +-
 .../auth/credentials/CredentialsRolesCard.js  |   6 +-
 .../credentials/CredentialsSessionCard.js     |   2 +-
 .../credentials/CredentialsTenantsCard.js     |   6 +-
 .../credentials/ResetPasswordContainer.js     |   6 +-
 .../resources/ResourcesCreateContainer.js     |   2 +-
 .../resources/ResourcesDetailContainer.js     |   4 +-
 .../auth/resources/ResourcesListContainer.js  |   2 +-
 .../auth/roles/RolesCreateContainer.js        |   2 +-
 .../auth/roles/RolesDetailContainer.js        |  16 +--
 src/modules/auth/roles/RolesListContainer.js  |   2 +-
 src/modules/auth/roles/RolesResourcesCard.js  |   6 +-
 .../auth/session/SessionDetailContainer.js    |   4 +-
 .../auth/session/SessionListContainer.js      |   8 +-
 .../auth/tenant/TenantCreateContainer.js      |   4 +-
 .../auth/tenant/TenantDetailContainer.js      |  18 +--
 .../auth/tenant/TenantListContainer.js        |   2 +-
 22 files changed, 165 insertions(+), 170 deletions(-)

diff --git a/public/locales/cs/translation.json b/public/locales/cs/translation.json
index 7515774c..cedcc6a9 100644
--- a/public/locales/cs/translation.json
+++ b/public/locales/cs/translation.json
@@ -84,16 +84,16 @@
 	},
 	"ClientListContainer": {
 		"Application type": "Typ aplikace",
-		"Failed to fetch clients": "Nepodařilo se načíst klienty",
+		"Failed to fetch clients": "Nepodařilo se načíst klienty. {{error}}",
 		"Client name": "Název klienta",
 		"New client": "Nový klient",
 		"Clients": "Klienti",
 		"Search": "Vyhledat"
 	},
 	"ClientCreateContainer": {
-		"Something went wrong, failed to fetch clients": "Něco je špatně, nepodařilo se získat klienty",
+		"Something went wrong, failed to fetch clients": "Něco je špatně, nepodařilo se získat klienty. {{error}}",
 		"Client has been created": "Klient byl vytvořen",
-		"Something went wrong, client has not been created": "Něco je špatně, klient nebyl vytvořen",
+		"Something went wrong, client has not been created": "Něco je špatně, klient nebyl vytvořen. {{error}}",
 		"Create new client": "Vytvořit nového klienta",
 		"Template": "Šablona",
 		"Client name": "Název klienta",
@@ -108,15 +108,15 @@
 		"Unknown item": "Neznámá položka"
 	},
 	"ClientDetailContainer": {
-		"Something went wrong, failed to fetch client details": "Něco je špatně, nepodařilo se získat detail klienta",
+		"Something went wrong, failed to fetch client details": "Něco je špatně, nepodařilo se získat detail klienta. {{error}}",
 		"Secret has been reset successfully": "Heslo bylo úspěšně resetováno",
-		"Something went wrong, failed to reset secret": "Reset hesla se nezdařil",
+		"Something went wrong, failed to reset secret": "Reset hesla se nezdařil. {{error}}",
 		"Do you want to reset this secret?": "Přejete si resetovat toto heslo?",
-		"Something went wrong, failed to update client": "Něco je špatně, nepodařilo se aktualizovat klienta",
+		"Something went wrong, failed to update client": "Něco je špatně, nepodařilo se aktualizovat klienta. {{error}}",
 		"Do you want to remove this client?": "Chcete odstranit tohoto klienta?",
 		"Client removed successfully": "Klient úspěšně odstraněn",
 		"Client updated successfully": "Klient úspěšně aktualizován",
-		"Something went wrong, failed to remove client": "Něco je špatně, nepodařilo se odstranit klienta",
+		"Something went wrong, failed to remove client": "Něco je špatně, nepodařilo se odstranit klienta. {{error}}",
 		"Client": "Klient",
 		"Client name": "Název klienta",
 		"Client ID": "ID klienta",
@@ -145,13 +145,13 @@
 		"Provider": "Provider",
 		"Create credentials": "Vytvořit údaje",
 		"Credentials have been created successfully": "Údaje byly úspěšně vytvořeny",
-		"Something went wrong, failed to create credentials": "Něco je špatně, údaje nebyly vytvořeny: {{error}}",
-		"Something went wrong, failed to fetch providers": "Něco je špatně, získání providerů selhalo: {{error}}",
+		"Something went wrong, failed to create credentials": "Něco je špatně, údaje nebyly vytvořeny. {{error}}",
+		"Something went wrong, failed to fetch providers": "Něco je špatně, získání providerů selhalo. {{error}}",
 		"Create": "Vytvořit",
 		"Invite": "Pozvat",
 		"Invite user": "Pozvat uživatele",
 		"Invitation sent successfully": "Pozvánka úspěšně odeslána",
-		"Something went wrong, failed to send invitation": "Něco je špatně, pozvánka nebyla odeslána: {{error}}"
+		"Something went wrong, failed to send invitation": "Něco je špatně, pozvánka nebyla odeslána. {{error}}"
 	},
 	"CredentialsDetailContainer": {
 		"Credentials": "Uživatelské údaje",
@@ -173,19 +173,19 @@
 		"Do you want to remove this user?": "Opravdu chcete odstranit tohoto uživatele?",
 		"Do you want to suspend this user?": "Opravdu chcete suspendovat tohoto uživatele?",
 		"Do you want to activate this user?": "Opravdu chcete aktivovat tohoto uživatele?",
-		"Something went wrong, failed to fetch user details": "Něco je špatně, nepodařilo se získat detaily uživatele",
-		"Something went wrong, failed to fetch user sessions": "Něco je špatně, nepodařilo se získat relace uživatele",
-		"Something went wrong, failed to remove user": "Něco je špatně, nepodařilo se odstranit uživatele",
+		"Something went wrong, failed to fetch user details": "Něco je špatně, nepodařilo se získat detaily uživatele. {{error}}",
+		"Something went wrong, failed to fetch user sessions": "Něco je špatně, nepodařilo se získat relace uživatele. {{error}}",
+		"Something went wrong, failed to remove user": "Něco je špatně, nepodařilo se odstranit uživatele. {{error}}",
 		"User removed successfully": "Uživatel úspěšně odstraněn",
-		"Something went wrong, failed to update user": "Něco je špatně, nepodařilo se aktualizovat uživatele",
+		"Something went wrong, failed to update user": "Něco je špatně, nepodařilo se aktualizovat uživatele. {{error}}",
 		"User has been updated successfully": "Uživatel úspěšně aktualizován",
 		"Phone number already in use": "Telefonní číslo je již použito",
 		"Email address already in use": "Emailová adresa je již použita",
-		"Something went wrong, failed to fetch provider data": "Něco je špatně, nepodařilo se získat data provideru",
+		"Something went wrong, failed to fetch provider data": "Něco je špatně, nepodařilo se získat data provideru. {{error}}",
 		"Information editing is not allowed within this credentials": "V rámci těchto uživatelských údajů není povolena úprava informací",
 		"Invited": "Pozván",
 		"Resend invitation": "Přeposlat pozvánku",
-		"Something went wrong, failed to resend invitation": "Něco je špatně, pozvánka nebyla odeslána: {{error}}",
+		"Something went wrong, failed to resend invitation": "Něco je špatně, pozvánka nebyla odeslána. {{error}}",
 		"Invitation sent successfully": "Pozvánka úspěšně odeslána"
 	},
 	"CredentialsRolesCard": {
@@ -193,30 +193,29 @@
 		"Assign a new role": "Přidat novou roli",
 		"Select role to assign ...": "Vyberte roli k přiřazení ...",
 		"Roles updated successfully": "Role úspěšně aktualizované",
-		"Failed to update roles": "Role se nepodařilo aktualizovat",
-		"Something went wrong, failed to fetch roles": "Něco je špatně, nepodařilo se získat role",
-		"Something went wrong, failed to fetch assigned roles": "Něco je špatně, nepodařilo se získat přiřazené role"
+		"Failed to update roles": "Role se nepodařilo aktualizovat. {{error}}",
+		"Something went wrong, failed to fetch roles": "Něco je špatně, nepodařilo se získat role. {{error}}",
+		"Something went wrong, failed to fetch assigned roles": "Něco je špatně, nepodařilo se získat přiřazené role. {{error}}"
 	},
 	"CredentialsTenantsCard": {
 		"Tenants": "Tenanti",
 		"Assign a tenant": "Přiřadit tenanta",
 		"Search": "Vyhledat",
 		"Tenants updated successfully": "Tenanti úspěšně aktualizováni",
-		"Failed to update tenants": "Tenanty se nepodařilo aktualizovat",
-		"Something went wrong, failed to fetch tenants": "Něco je špatně, nepodařilo se získat tenanty",
-		"Something went wrong, failed to fetch assigned tenants": "Něco je špatně, nepodařilo se získat přiřazené tenanty",
+		"Failed to update tenants": "Tenanty se nepodařilo aktualizovat. {{error}}",
+		"Something went wrong, failed to fetch tenants": "Něco je špatně, nepodařilo se získat tenanty. {{error}}",
+		"Something went wrong, failed to fetch assigned tenants": "Něco je špatně, nepodařilo se získat přiřazené tenanty. {{error}}",
 		"No match": "Shoda nenalezena"
 	},
 	"CredentialsSessionCard": {
 		"Sessions": "Relace",
-		"User sessions": "Relace uživatele",
 		"No active sessions": "Žádné aktivní relace",
 		"Terminate user sessions": "Ukončit relace uživatele",
 		"Terminate sessions": "Ukončit relace",
 		"Do you want to terminate user sessions?": "Opravdu chcete ukončit relace uživatele?",
 		"Sessions successfully terminated": "Relace úspěšně ukončeny",
 		"Something went wrong when terminating sessions": "Něco se pokazilo při ukončování relací",
-		"Failed to terminate sessions": "Nepodařilo se ukončit relace"
+		"Failed to terminate sessions": "Nepodařilo se ukončit relace. {{error}}"
 	},
 	"CredentialsListContainer": {
 		"Credentials": "Uživatelské údaje",
@@ -228,7 +227,7 @@
 		"Search": "Hledat",
 		"Tenants": "Tenanti",
 		"Roles": "Role",
-		"Something went wrong, failed to fetch data": "Něco je špatně, nepodařilo se získat data: {{error}}",
+		"Something went wrong, failed to fetch data": "Něco je špatně, nepodařilo se získat data. {{error}}",
 		"Can't fetch the data, you don't have rights to display it": "Nepodařilo se získat data, nemáte dostatečná oprávnění k jejich zobrazení",
 		"Credentials invited": "Uživatel pozván"
 	},
@@ -264,30 +263,30 @@
 		"Username": "Uživatelské jméno",
 		"ID": "ID",
 		"Password has been reset": "Heslo bylo obnoveno",
-		"Something went wrong, failed to reset user's password": "Něco je špatně, nepodařilo se obnovit heslo",
+		"Something went wrong, failed to reset user's password": "Něco je špatně, nepodařilo se obnovit heslo. {{error}}",
 		"Specify password": "Specifikovat heslo",
 		"New password": "Nové heslo",
 		"Password cannot be empty!": "Heslo nemůže být prázdné!",
 		"Do you want to reset password for this user?": "Opravdu chcete obnovit heslo pro tohoto uživatele?",
-		"Something went wrong, failed to fetch user details": "Něco je špatně, nepodařilo se získat data uživatele"
+		"Something went wrong, failed to fetch user details": "Něco je špatně, nepodařilo se získat data uživatele. {{error}}"
 	},
 	"RolesListContainer": {
 		"Roles overview": "Přehled rolí",
 		"Create role": "Vytvořit roli",
 		"Role": "Role",
-		"Something went wrong, failed to fetch roles": "Něco je špatně, nepodařilo se získat role"
+		"Something went wrong, failed to fetch roles": "Něco je špatně, nepodařilo se získat role. {{error}}"
 	},
 	"RolesDetailContainer": {
 		"Role removed successfully": "Role úspěšně odstraněna",
-		"Failed to remove the role": "Nepodařilo se odstranit roli",
+		"Failed to remove the role": "Nepodařilo se odstranit roli. {{error}}",
 		"Role": "Role",
 		"Remove role": "Odstranit roli",
 		"Do you want to remove the role?": "Chcete tuto roli odebrat?",
-		"Something went wrong, failed to fetch role detail": "Něco je špatně, nepodařilo se získat detail role",
-		"Something went wrong, failed to fetch data": "Něco je špatně, nepodařilo se získat data",
+		"Something went wrong, failed to fetch role detail": "Něco je špatně, nepodařilo se získat detail role. {{error}}",
+		"Something went wrong, failed to fetch data": "Něco je špatně, nepodařilo se získat data. {{error}}",
 		"Can't fetch the data, you don't have rights to display it": "Nepodařilo se získat data, nemáte dostatečná oprávnění k jejich zobrazení",
-		"Something went wrong, the credentials cannot be assigned": "Něco je špatně, nepodařilo se přiřadit uživatele",
-		"Something went wrong, the credentials cannot be unassigned": "Něco je špatně, nepodařilo se odebrat uživatele",
+		"Something went wrong, the credentials cannot be assigned": "Něco je špatně, nepodařilo se přiřadit uživatele. {{error}}",
+		"Something went wrong, the credentials cannot be unassigned": "Něco je špatně, nepodařilo se odebrat uživatele. {{error}}",
 		"The selected credential has already been assigned": "Vybraný uživatel byl již přiřazen",
 		"Unable to assign credentials": "Nepodařilo se přiřadit uživatele",
 		"Unable to unassign credentials": "Nepodařilo se odebrat uživatele",
@@ -298,7 +297,7 @@
 		"Unassign credentials": "Odebrat uživatele",
 		"Do you want to unassign these credentials?": "Opravdu chcete odebrat uživatele?",
 		"Credentials suspended": "Uživatel suspendován",
-		"Something went wrong, failed to fetch assigned credentials": "Něco je špatně, nepodařilo se získat přiřazené uživatelské údaje",
+		"Something went wrong, failed to fetch assigned credentials": "Něco je špatně, nepodařilo se získat přiřazené uživatelské údaje. {{error}}",
 		"Assign credentials": "Přiřadit uživatelské údaje",
 		"Assigned credentials": "Přiřazené uživatelské údaje"
 	},
@@ -314,13 +313,13 @@
 		"Invalid format, only letters, numbers, dash and underscore are allowed": "Nesprávný formát, pouze písmena, číslice, pomlčka a podtržítko jsou povoleny",
 		"Invalid format": "Nesprávný formát:",
 		"Only letters, numbers, dash and underscore are allowed": "Pouze písmena, číslice, pomlčka a podtržítko jsou povoleny",
-		"Something went wrong, role has not been created": "Něco je špatně, role nebyla vytvořena"
+		"Something went wrong, role has not been created": "Něco je špatně, role nebyla vytvořena. {{error}}"
 	},
 	"RolesResourcesCard": {
-		"Fetch of all resources failed": "Nepodařilo se načíst všechny zdroje",
-		"Fetch of assigned resources failed": "Nepodařilo se načíst přiřazené zdroje",
+		"Fetch of all resources failed": "Nepodařilo se načíst všechny zdroje. {{error}}",
+		"Fetch of assigned resources failed": "Nepodařilo se načíst přiřazené zdroje. {{error}}",
 		"Role has been updated successfully": "Aktualizace role proběhla úspěšně",
-		"Update of the role has failed": "Aktualizace role se nezdařila",
+		"Update of the role has failed": "Aktualizace role se nezdařila. {{error}}",
 		"Assigned resources": "Přiřazené zdroje",
 		"Add resource": "Přidat zdroj",
 		"Select resource": "Vyberte zdroj",
@@ -342,45 +341,44 @@
 		"Invalid format, resource cannot start with a underscore": "Nesprávný formát, zdroj nemůže začínat podtržítkem",
 		"Invalid format, only lower-case letters, numbers, dash and underscore are allowed": "Nesprávný formát, pouze malá písmena, číslice, pomlčka a podtržítko jsou povoleny",
 		"Only lower-case letters, numbers, dash and underscore are allowed": "Pouze malá písmena, číslice, pomlčka a podtržítko jsou povoleny",
-		"Something went wrong, failed to create resource": "Něco je špatně, nepodařilo se vytvořit zdroj"
+		"Something went wrong, failed to create resource": "Něco je špatně, nepodařilo se vytvořit zdroj. {{error}}"
 	},
 	"ResourcesDetailContainer": {
 		"Resource": "Zdroj",
 		"Resource updated successfully": "Zdroj byl úspěšně aktualizován",
-		"Something went wrong, can't fetch resource details": "Něco je špatně, nepodařilo se načíst zdroj",
-		"Something went wrong, failed to update resource": "Něco je špatně, aktualizace zdroje se nezdařila"
+		"Something went wrong, can't fetch resource details": "Něco je špatně, nepodařilo se načíst zdroj. {{error}}",
+		"Something went wrong, failed to update resource": "Něco je špatně, aktualizace zdroje se nezdařila. {{error}}"
 	},
 	"ResourcesListContainer": {
 		"Resources list": "Seznam zdrojů",
 		"Create resource": "Vytvořit zdroj",
-		"Something went wrong, failed to load resources": "Něco je špatně, nepodařilo se načíst zdroje"
+		"Something went wrong, failed to load resources": "Něco je špatně, nepodařilo se načíst zdroje. {{error}}"
 	},
 	"SessionListContainer": {
 		"Credentials": "Uživ. Identifikace",
-		"Failed to fetch the object": "Nepodařilo se načíst objekt.",
+		"Failed to fetch the object": "Nepodařilo se načíst objekt. {{error}}",
 		"Sessions": "Relace",
 		"Expected expiration": "Očekávané vypršení platnosti",
 		"Terminate session": "Ukončit relaci",
 		"Do you want to terminate this session?": "Opravdu chcete ukončit tuto relaci?",
 		"Session successfully terminated": "Relace úspěšně ukončena",
 		"Something went wrong when terminating session": "Něco se pokazilo při ukončování relace",
-		"Failed to terminate the session": "Nepodařilo se ukončit relaci",
+		"Failed to terminate the session": "Nepodařilo se ukončit relaci. {{error}}",
 		"Terminate all sessions": "Ukončit všechny relace",
 		"Terminate all": "Ukončit vše",
 		"Do you want to terminate all sessions?": "Opravdu chcete ukončit všechny relace?",
 		"All sessions successfully terminated": "Všechny relace úspěšně ukončeny",
 		"Something went wrong when terminating all sessions": "Něco se pokazilo při ukončování všech relací",
-		"Failed to terminate all sessions": "Nepodařilo se ukončit všechny relace",
+		"Failed to terminate all sessions": "Nepodařilo se ukončit všechny relace. {{error}}",
 		"Access denied, you do not have a right to perform this action": "Přístup odepřen, nemáte dostatečná oprávnění",
 		"Session": "Relace"
 	},
 	"SessionDetailContainer": {
-		"Something went wrong when fetching details": "Něco se pokazilo při načítání detailu relace",
-		"Failed to fetch details": "Nepodařilo se načíst relace",
+		"Failed to fetch details": "Nepodařilo se načíst relace. {{error}}",
 		"Do you want to terminate this session?": "Opravdu chcete ukončit tuto relaci?",
 		"Session successfully terminated": "Relace úspěšně ukončena",
 		"Something went wrong when terminating session": "Něco se pokazilo při ukončování relace",
-		"Failed to terminate the session": "Nepodařilo se ukončit relaci",
+		"Failed to terminate the session": "Nepodařilo se ukončit relaci. {{error}}",
 		"Session": "Relace",
 		"Terminate session": "Ukončit relaci",
 		"Session ID": "ID relace",
@@ -393,7 +391,7 @@
 		"Authorization": "Autorizace"
 	},
 	"TenantListContainer": {
-		"Failed to fetch tenants": "Nepodařilo se načíst tenanty",
+		"Failed to fetch tenants": "Nepodařilo se načíst tenanty. {{error}}",
 		"Tenants": "Tenanti",
 		"New tenant": "Nový tenant"
 	},
@@ -407,7 +405,7 @@
 		"No changes were made": "Nebyly provedeny žádné změny",
 		"Remove input": "Odstranit pole",
 		"Nothing to remove": "Žádná data k vymazání",
-		"Something went wrong, failed to update data": "Něco je špatně, nepodařilo se upravit vlastní data",
+		"Something went wrong, failed to update data": "Něco je špatně, nepodařilo se upravit vlastní data. {{error}}",
 		"Data updated successfully": "Vlastní data úspěšně aktualizována",
 		"Changes have not been saved. Discard and continue?": "Provedené změny nebyly uloženy. Chcete je zahodit a pokračovat?",
 		"Name": "Název",
@@ -418,14 +416,13 @@
 	"TenantDetailContainer": {
 		"Tenant": "Tenant",
 		"Custom data": "Vlastní data",
-		"Something went wrong, failed to fetch tenant detail": "Něco je špatně, nepodařilo se získat detail tenanta",
+		"Something went wrong, failed to fetch tenant detail": "Něco je špatně, nepodařilo se získat detail tenanta. {{error}}",
 		"Assigned credentials": "Přiřazené uživatelské údaje",
 		"Assign credentials": "Přiřadit uživatelské údaje",
-		"Something went wrong, failed to fetch assigned credentials": "Něco je špatně, nepodařilo se získat přiřazené uživatelské údaje",
-		"Something went wrong, failed to update credentials": "Něco je špatně, nepodařilo se upravit uživatelské údaje",
-		"Something went wrong, the credentials cannot be assigned": "Něco je špatně, nepodařilo se přiřadit uživatele",
-		"Something went wrong, the credentials cannot be unassigned": "Něco je špatně, nepodařilo se odebrat uživatele",
-		"Something went wrong, failed to fetch data": "Něco je špatně, nepodařilo se získat data",
+		"Something went wrong, failed to fetch assigned credentials": "Něco je špatně, nepodařilo se načíst přiřazené uživatelské údaje. {{error}}",
+		"Something went wrong, the credentials cannot be assigned": "Něco je špatně, nepodařilo se přiřadit uživatele. {{error}}",
+		"Something went wrong, the credentials cannot be unassigned": "Něco je špatně, nepodařilo se odebrat uživatele. {{error}}",
+		"Something went wrong, failed to fetch data": "Něco je špatně, nepodařilo se získat data. {{error}}",
 		"The selected credential has already been assigned": "Vybraný uživatel byl již přiřazen",
 		"Can't fetch the data, you don't have rights to display it": "Nepodařilo se získat data, nemáte dostatečná oprávnění k jejich zobrazení",
 		"Unable to unassign credentials": "Nepodařilo se odebrat uživatele",
@@ -439,7 +436,7 @@
 		"Unassign credentials": "Odebrat uživatele",
 		"Do you want to remove the tenant?": "Opravdu chcete odstranit tenanta?",
 		"Do you want to unassign these credentials?": "Opravdu chcete odebrat uživatele?",
-		"Failed to remove the tenant": "Nepodařilo se odstranit tenanta",
+		"Failed to remove the tenant": "Nepodařilo se odstranit tenanta. {{error}}",
 		"Tenant removed successfully": "Tenant úspěšně odstraněn",
 		"Tenant data updated successfully": "Tenant úspěšně aktualizován"
 	},
@@ -457,8 +454,8 @@
 		"Tenant name is too short, minimum is 3 characters": "Název tenanta je příliš krátký, nutné jsou alespoň 3 znaky",
 		"Invalid format, only lower-case letters, numbers, dash and underscore are allowed": "Nesprávný formát, pouze malá písmena, číslice, pomlčka a podtržítko jsou povoleny",
 		"Only lower-case letters, numbers, dash and underscore are allowed": "Pouze malá písmena, číslice, pomlčka a podtržítko jsou povoleny",
-		"Something went wrong, failed to create tenant": "Něco je špatně, nepodařilo se vytvořit tenanta",
-		"Something went wrong, can't propose tenant name": "Něco je špatně, není možné navrhnout jméno tenanta"
+		"Something went wrong, failed to create tenant": "Něco je špatně, nepodařilo se vytvořit tenanta. {{error}}",
+		"Something went wrong, can't propose tenant name": "Něco je špatně, není možné navrhnout jméno tenanta. {{error}}"
 	},
 	"UserInterfaceCard": {
 		"User interface": "Uživatelské rozhraní",
diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
index d0cf69ac..e719137d 100644
--- a/public/locales/en/translation.json
+++ b/public/locales/en/translation.json
@@ -84,16 +84,16 @@
 	},
 	"ClientListContainer": {
 		"Application type": "Application type",
-		"Failed to fetch clients": "Failed to fetch clients",
+		"Failed to fetch clients": "Failed to fetch clients. {{error}}",
 		"Client name": "Client name",
 		"New client": "New client",
 		"Clients": "Clients",
 		"Search": "Search"
 	},
 	"ClientCreateContainer": {
-		"Something went wrong, failed to fetch clients": "Something went wrong, failed to fetch clients",
+		"Something went wrong, failed to fetch clients": "Something went wrong, failed to fetch clients. {{error}}",
 		"Client has been created": "Client has been created",
-		"Something went wrong, client has not been created": "Something went wrong, client has not been created",
+		"Something went wrong, client has not been created": "Something went wrong, client has not been created. {{error}}",
 		"Create new client": "Create new client",
 		"Template": "Template",
 		"Client name": "Client name",
@@ -108,15 +108,15 @@
 		"Unknown item": "Unknown item"
 	},
 	"ClientDetailContainer": {
-		"Something went wrong, failed to fetch client details": "Something went wrong, failed to fetch client details",
+		"Something went wrong, failed to fetch client details": "Something went wrong, failed to fetch client details. {{error}}",
 		"Secret has been reset successfully": "Secret has been reset successfully",
-		"Something went wrong, failed to reset secret": "Something went wrong, failed to reset secret",
+		"Something went wrong, failed to reset secret": "Something went wrong, failed to reset secret. {{error}}",
 		"Do you want to reset this secret?": "Do you want to reset this secret?",
-		"Something went wrong, failed to update client": "Something went wrong, failed to update client",
+		"Something went wrong, failed to update client": "Something went wrong, failed to update client. {{error}}",
 		"Do you want to remove this client?": "Do you want to remove this client?",
 		"Client removed successfully": "Client removed successfully",
 		"Client updated successfully": "Client updated successfully",
-		"Something went wrong, failed to remove client": "Something went wrong, failed to remove client",
+		"Something went wrong, failed to remove client": "Something went wrong, failed to remove client. {{error}}",
 		"Client": "Client",
 		"Client name": "Client name",
 		"Client ID": "Client ID",
@@ -145,13 +145,13 @@
 		"Provider": "Provider",
 		"Create credentials": "Create credentials",
 		"Credentials have been created successfully": "Credentials have been created successfully",
-		"Something went wrong, failed to create credentials": "Something went wrong, failed to create credentials: {{error}}",
-		"Something went wrong, failed to fetch providers": "Something went wrong, failed to fetch providers: {{error}}",
+		"Something went wrong, failed to create credentials": "Something went wrong, failed to create credentials. {{error}}",
+		"Something went wrong, failed to fetch providers": "Something went wrong, failed to fetch providers. {{error}}",
 		"Create": "Create",
 		"Invite": "Invite",
 		"Invite user": "Invite user",
 		"Invitation sent successfully": "Invitation sent successfully",
-		"Something went wrong, failed to send invitation": "Something went wrong, failed to send invitation: {{error}}"
+		"Something went wrong, failed to send invitation": "Something went wrong, failed to send invitation. {{error}}"
 	},
 	"CredentialsDetailContainer": {
 		"Credentials": "Credentials",
@@ -173,19 +173,19 @@
 		"Do you want to remove this user?": "Do you want to remove this user?",
 		"Do you want to suspend this user?": "Do you want to suspend this user?",
 		"Do you want to activate this user?": "Do you want to activate this user?",
-		"Something went wrong, failed to fetch user details": "Something went wrong, failed to fetch user details: {{error}}",
-		"Something went wrong, failed to fetch user sessions": "Something went wrong, failed to fetch user sessions: {{error}}",
-		"Something went wrong, failed to remove user": "Something went wrong, failed to remove user: {{error}}",
+		"Something went wrong, failed to fetch user details": "Something went wrong, failed to fetch user details. {{error}}",
+		"Something went wrong, failed to fetch user sessions": "Something went wrong, failed to fetch user sessions. {{error}}",
+		"Something went wrong, failed to remove user": "Something went wrong, failed to remove user. {{error}}",
 		"User removed successfully": "User removed successfully",
-		"Something went wrong, failed to update user": "Something went wrong, failed to update user: {{error}}",
+		"Something went wrong, failed to update user": "Something went wrong, failed to update user. {{error}}",
 		"User has been updated successfully": "User has been updated successfully",
 		"Phone number already in use": "Phone number already in use",
 		"Email address already in use": "Email address already in use",
-		"Something went wrong, failed to fetch provider data": "Something went wrong, failed to fetch provider data: {{error}}",
+		"Something went wrong, failed to fetch provider data": "Something went wrong, failed to fetch provider data. {{error}}",
 		"Information editing is not allowed within this credentials": "Information editing is not allowed within this credentials",
 		"Invited": "Invited",
 		"Resend invitation": "Resend invitation",
-		"Something went wrong, failed to resend invitation": "Something went wrong, failed to resend invitation: {{error}}",
+		"Something went wrong, failed to resend invitation": "Something went wrong, failed to resend invitation. {{error}}",
 		"Invitation sent successfully": "Invitation sent successfully"
 	},
 	"CredentialsRolesCard": {
@@ -193,18 +193,18 @@
 		"Assign a new role": "Assign a new role",
 		"Select role to assign ...": "Select role to assign ...",
 		"Roles updated successfully": "Roles updated successfully",
-		"Failed to update roles": "Failed to update roles",
-		"Something went wrong, failed to fetch roles": "Something went wrong, failed to fetch roles",
-		"Something went wrong, failed to fetch assigned roles": "Something went wrong, failed to fetch assigned roles"
+		"Failed to update roles": "Failed to update roles. {{error}}",
+		"Something went wrong, failed to fetch roles": "Something went wrong, failed to fetch roles. {{error}}",
+		"Something went wrong, failed to fetch assigned roles": "Something went wrong, failed to fetch assigned roles. {{error}}"
 	},
 	"CredentialsTenantsCard": {
 		"Tenants": "Tenants",
 		"Assign a tenant": "Assign a tenant",
 		"Search": "Search",
 		"Tenants updated successfully": "Tenants updated successfully",
-		"Failed to update tenants": "Failed to update tenants",
-		"Something went wrong, failed to fetch tenants": "Something went wrong, failed to fetch tenants",
-		"Something went wrong, failed to fetch assigned tenants": "Something went wrong, failed to fetch assigned tenants",
+		"Failed to update tenants": "Failed to update tenants. {{error}}",
+		"Something went wrong, failed to fetch tenants": "Something went wrong, failed to fetch tenants. {{error}}",
+		"Something went wrong, failed to fetch assigned tenants": "Something went wrong, failed to fetch assigned tenants. {{error}}",
 		"No match": "No match"
 	},
 	"CredentialsSessionCard": {
@@ -215,7 +215,7 @@
 		"Do you want to terminate user sessions?": "Do you want to terminate user sessions?",
 		"Sessions successfully terminated": "Sessions successfully terminated",
 		"Something went wrong when terminating sessions": "Something went wrong when terminating sessions",
-		"Failed to terminate sessions": "Failed to terminate sessions"
+		"Failed to terminate sessions": "Failed to terminate sessions. {{error}}"
 	},
 	"CredentialsListContainer": {
 		"Credentials": "Credentials",
@@ -227,7 +227,7 @@
 		"Search": "Search",
 		"Tenants": "Tenants",
 		"Roles": "Roles",
-		"Something went wrong, failed to fetch data": "Something went wrong, failed to fetch data: {{error}}",
+		"Something went wrong, failed to fetch data": "Something went wrong, failed to fetch data. {{error}}",
 		"Can't fetch the data, you don't have rights to display it": "Can't fetch the data, you don't have rights to display it",
 		"Credentials invited": "Credentials invited"
 	},
@@ -262,31 +262,31 @@
 		"Username": "Username",
 		"ID": "ID",
 		"Password has been reset": "Password has been reset",
-		"Something went wrong, failed to reset user's password": "Something went wrong, failed to reset user's password",
+		"Something went wrong, failed to reset user's password": "Something went wrong, failed to reset user's password. {{error}}",
 		"Reset password": "Reset password",
 		"Specify password": "Specify password",
 		"New password": "New password",
 		"Password cannot be empty!": "Password cannot be empty!",
 		"Do you want to reset password for this user?": "Do you want to reset password for this user?",
-		"Something went wrong, failed to fetch user details": "Something went wrong, failed to fetch user details"
+		"Something went wrong, failed to fetch user details": "Something went wrong, failed to fetch user details. {{error}}"
 	},
 	"RolesListContainer": {
 		"Roles overview": "Roles overview",
 		"Create role": "Create role",
 		"Role": "Role",
-		"Something went wrong, failed to fetch roles": "Something went wrong, failed to fetch roles"
+		"Something went wrong, failed to fetch roles": "Something went wrong, failed to fetch roles. {{error}}"
 	},
 	"RolesDetailContainer": {
 		"Role removed successfully": "Role removed successfully",
-		"Failed to remove the role": "Failed to remove the role",
+		"Failed to remove the role": "Failed to remove the role. {{error}}",
 		"Role": "Role",
 		"Remove role": "Remove role",
 		"Do you want to remove the role?": "Do you want to remove the role?",
-		"Something went wrong, failed to fetch role detail": "Something went wrong, failed to fetch role detail",
-		"Something went wrong, failed to fetch data": "Something went wrong, failed to fetch data",
+		"Something went wrong, failed to fetch role detail": "Something went wrong, failed to fetch role detail. {{error}}",
+		"Something went wrong, failed to fetch data": "Something went wrong, failed to fetch data. {{error}}",
 		"Can't fetch the data, you don't have rights to display it": "Can't fetch the data, you don't have rights to display it",
-		"Something went wrong, the credentials cannot be assigned": "Something went wrong, the credentials cannot be assigned",
-		"Something went wrong, the credentials cannot be unassigned": "Something went wrong, the credentials cannot be unassigned",
+		"Something went wrong, the credentials cannot be assigned": "Something went wrong, the credentials cannot be assigned. {{error}}",
+		"Something went wrong, the credentials cannot be unassigned": "Something went wrong, the credentials cannot be unassigned. {{error}}",
 		"The selected credential has already been assigned": "The selected credential has already been assigned",
 		"Unable to assign credentials": "Unable to assign credentials",
 		"Unable to unassign credentials": "Unable to unassign credentials",
@@ -297,7 +297,7 @@
 		"Unassign credentials": "Unassign credentials",
 		"Do you want to unassign these credentials?": "Do you want to unassign these credentials?",
 		"Credentials suspended": "Credentials suspended",
-		"Something went wrong, failed to fetch assigned credentials": "Something went wrong, failed to fetch assigned credentials",
+		"Something went wrong, failed to fetch assigned credentials": "Something went wrong, failed to fetch assigned credentials. {{error}}",
 		"Assign credentials": "Assign credentials",
 		"Assigned credentials": "Assigned credentials"
 	},
@@ -313,13 +313,13 @@
 		"Invalid format, only letters, numbers, dash and underscore are allowed": "Invalid format, only letters, numbers, dash and underscore are allowed",
 		"Invalid format": "Invalid format:",
 		"Only letters, numbers, dash and underscore are allowed": "Only letters, numbers, dash and underscore are allowed",
-		"Something went wrong, role has not been created": "Something went wrong, role has not been created"
+		"Something went wrong, role has not been created": "Something went wrong, role has not been created. {{error}}"
 	},
 	"RolesResourcesCard": {
-		"Fetch of all resources failed": "Failed to fetch all resources",
-		"Fetch of assigned resources failed": "Failed to fetch assigned resources",
+		"Fetch of all resources failed": "Failed to fetch all resources. {{error}}",
+		"Fetch of assigned resources failed": "Failed to fetch assigned resources. {{error}}",
 		"Role has been updated successfully": "Role has been updated successfully",
-		"Update of the role has failed": "Update of the role has failed",
+		"Update of the role has failed": "Update of the role has failed. {{error}}",
 		"Assigned resources": "Assigned resources",
 		"Add resource": "Add resource",
 		"Select resource": "Select resource",
@@ -341,45 +341,44 @@
 		"Invalid format, resource cannot start with a underscore": "Invalid format, resource cannot start with a underscore",
 		"Invalid format, only letters, numbers, dash and underscore are allowed": "Invalid format, only letters, numbers, dash and underscore are allowed",
 		"Only lower-case letters, numbers, dash and underscore are allowed": "Only lower-case letters, numbers, dash and underscore are allowed",
-		"Something went wrong, failed to create resource": "Something went wrong, failed to create resource"
+		"Something went wrong, failed to create resource": "Something went wrong, failed to create resource. {{error}}"
 	},
 	"ResourcesDetailContainer": {
 		"Resource": "Resource",
 		"Resource updated successfully": "Resource updated successfully",
-		"Something went wrong, can't fetch resource details": "Something went wrong, can't fetch resource details",
-		"Something went wrong, failed to update resource": "Something went wrong, failed to update resource"
+		"Something went wrong, can't fetch resource details": "Something went wrong, can't fetch resource details. {{error}}",
+		"Something went wrong, failed to update resource": "Something went wrong, failed to update resource. {{error}}"
 	},
 	"ResourcesListContainer": {
 		"Resources list": "Resources list",
 		"Create resource": "Create resource",
-		"Something went wrong, failed to load resources": "Something went wrong, failed to load resources"
+		"Something went wrong, failed to load resources": "Something went wrong, failed to load resources. {{error}}"
 	},
 	"SessionListContainer": {
 		"Credentials": "Credentials",
-		"Failed to fetch the object": "Failed to fetch the object.",
+		"Failed to fetch the object": "Failed to fetch the object. {{error}}",
 		"Sessions": "Sessions",
 		"Expected expiration": "Expected expiration",
 		"Terminate session": "Terminate session",
 		"Do you want to terminate this session?": "Do you want to terminate this session?",
 		"Session successfully terminated": "Session successfully terminated",
 		"Something went wrong when terminating session": "Something went wrong when terminating session",
-		"Failed to terminate the session": "Failed to terminate the session",
+		"Failed to terminate the session": "Failed to terminate the session. {{error}}",
 		"Terminate all sessions": "Terminate all sessions",
 		"Terminate all": "Terminate all",
 		"Do you want to terminate all sessions?": "Do you want to terminate all sessions?",
 		"All sessions successfully terminated": "All sessions successfully terminated",
 		"Something went wrong when terminating all sessions": "Something went wrong when terminating all sessions",
-		"Failed to terminate all sessions": "Failed to terminate all sessions",
+		"Failed to terminate all sessions": "Failed to terminate all sessions. {{error}}",
 		"Access denied, you do not have a right to perform this action": "Access denied, you do not have a right to perform this action",
 		"Session": "Session"
 	},
 	"SessionDetailContainer": {
-		"Something went wrong when fetching details": "Something went wrong when fetching details",
-		"Failed to fetch details": "Failed to fetch details",
+		"Failed to fetch details": "Failed to fetch details. {{error}}",
 		"Do you want to terminate this session?": "Do you want to terminate this session?",
 		"Session successfully terminated": "Session successfully terminated",
 		"Something went wrong when terminating session": "Something went wrong when terminating session",
-		"Failed to terminate the session": "Failed to terminate the session",
+		"Failed to terminate the session": "Failed to terminate the session. {{error}}",
 		"Session": "Session",
 		"Terminate session": "Terminate session",
 		"Session ID": "Session ID",
@@ -392,7 +391,7 @@
 		"Authorization": "Authorization"
 	},
 	"TenantListContainer": {
-		"Failed to fetch tenants": "Failed to fetch tenants",
+		"Failed to fetch tenants": "Failed to fetch tenants. {{error}}",
 		"Tenants": "Tenants",
 		"New tenant": "New tenant"
 	},
@@ -406,7 +405,7 @@
 		"No changes were made": "No changes were made",
 		"Remove input": "Remove input",
 		"Nothing to remove": "Nothing to remove",
-		"Something went wrong, failed to update data": "Something went wrong, failed to update data",
+		"Something went wrong, failed to update data": "Something went wrong, failed to update data. {{error}}",
 		"Data updated successfully": "Data updated successfully",
 		"Changes have not been saved. Discard and continue?": "Changes have not been saved. Discard and continue?",
 		"Name": "Name",
@@ -417,14 +416,13 @@
 	"TenantDetailContainer": {
 		"Tenant": "Tenant",
 		"Custom data": "Custom Data",
-		"Something went wrong, failed to fetch tenant detail": "Something went wrong, failed to fetch tenant detail",
+		"Something went wrong, failed to fetch tenant detail": "Something went wrong, failed to fetch tenant detail. {{error}}",
 		"Assigned credentials": "Assigned credentials",
 		"Assign credentials": "Assign credentials",
-		"Something went wrong, failed to fetch assigned credentials": "Something went wrong, failed to fetch assigned credentials",
-		"Something went wrong, failed to update credentials": "Something went wrong, failed to update credentials",
-		"Something went wrong, the credentials cannot be assigned": "Something went wrong, the credentials cannot be assigned",
-		"Something went wrong, the credentials cannot be unassigned": "Something went wrong, the credentials cannot be unassigned",
-		"Something went wrong, failed to fetch data": "Something went wrong, failed to fetch data",
+		"Something went wrong, failed to fetch assigned credentials": "Something went wrong, failed to fetch assigned credentials. {{error}}",
+		"Something went wrong, the credentials cannot be assigned": "Something went wrong, the credentials cannot be assigned. {{error}}",
+		"Something went wrong, the credentials cannot be unassigned": "Something went wrong, the credentials cannot be unassigned. {{error}}",
+		"Something went wrong, failed to fetch data": "Something went wrong, failed to fetch data. {{error}}",
 		"The selected credential has already been assigned": "The selected credential has already been assigned",
 		"Can't fetch the data, you don't have rights to display it": "Can't fetch the data, you don't have rights to display it",
 		"Unable to unassign credentials": "Unable to unassign credentials",
@@ -438,7 +436,7 @@
 		"Unassign credentials": "Unassign credentials",
 		"Do you want to remove the tenant?": "Do you want to remove the tenant?",
 		"Do you want to unassign these credentials?": "Do you want to unassign these credentials?",
-		"Failed to remove the tenant": "Failed to remove the tenant",
+		"Failed to remove the tenant": "Failed to remove the tenant. {{error}}",
 		"Tenant removed successfully": "Tenant removed successfully",
 		"Tenant data updated successfully": "Tenant data updated successfully"
 	},
@@ -457,8 +455,8 @@
 		"Invalid format, only lower-case letters, numbers, dash and underscore are allowed": "Invalid format, only lower-case letters, numbers, dash and underscore are allowed",
 		"Invalid format": "Invalid format:",
 		"Only lower-case letters, numbers, dash and underscore are allowed": "Only lower-case letters, numbers, dash and underscore are allowed",
-		"Something went wrong, failed to create tenant": "Something went wrong, failed to create tenant",
-		"Something went wrong, can't propose tenant name": "Something went wrong, can't propose tenant name"
+		"Something went wrong, failed to create tenant": "Something went wrong, failed to create tenant. {{error}}",
+		"Something went wrong, can't propose tenant name": "Something went wrong, can't propose tenant name. {{error}}"
 	},
 	"UserInterfaceCard": {
 		"User interface": "User interface",
diff --git a/src/modules/auth/clients/ClientCreateContainer.js b/src/modules/auth/clients/ClientCreateContainer.js
index e0ce5db1..da1db602 100644
--- a/src/modules/auth/clients/ClientCreateContainer.js
+++ b/src/modules/auth/clients/ClientCreateContainer.js
@@ -85,7 +85,7 @@ const ClientCreateContainer = (props) => {
 			setTemplate(response.data["templates"]);
 		} catch (e) {
 			console.error("Failed to retrieve providers from server: ", e);
-			props.app.addAlert("warning", t("ClientCreateContainer|Something went wrong, failed to fetch clients"));
+			props.app.addAlert("warning", t("ClientCreateContainer|Something went wrong, failed to fetch clients", {error: e?.response?.data?.message}), 30);
 		}
 	};
 
@@ -124,7 +124,7 @@ const ClientCreateContainer = (props) => {
 
 		} catch (e) {
 			console.error(e);
-			props.app.addAlert("warning", t("ClientCreateContainer|Something went wrong, client has not been created"));
+			props.app.addAlert("warning", t("ClientCreateContainer|Something went wrong, client has not been created", {error: e?.response?.data?.message}), 30);
 		}
 	};
 
diff --git a/src/modules/auth/clients/ClientDetailContainer.js b/src/modules/auth/clients/ClientDetailContainer.js
index 68b684d7..c5961ad7 100644
--- a/src/modules/auth/clients/ClientDetailContainer.js
+++ b/src/modules/auth/clients/ClientDetailContainer.js
@@ -64,7 +64,7 @@ const ClientDetailContainer = (props) =>  {
 			setClient(response.data);
 		} catch (e) {
 			console.error(e);
-			props.app.addAlert("warning", t("ClientDetailContainer|Something went wrong, failed to fetch client details"));
+			props.app.addAlert("warning", t("ClientDetailContainer|Something went wrong, failed to fetch client details", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
@@ -78,7 +78,7 @@ const ClientDetailContainer = (props) =>  {
 			getClientDetail();
 		} catch (e) {
 			console.error(e);
-			props.app.addAlert("warning", t('ClientDetailContainer|Something went wrong, failed to reset secret'));
+			props.app.addAlert("warning", t('ClientDetailContainer|Something went wrong, failed to reset secret', {error: e?.response?.data?.message}), 30);
 		}
 	}
 
@@ -128,7 +128,7 @@ const ClientDetailContainer = (props) =>  {
 			setDisabled(false);
 			setEditMode(true);
 			console.error(e);
-			props.app.addAlert("warning", t("ClientDetailContainer|Something went wrong, failed to update client"));
+			props.app.addAlert("warning", t("ClientDetailContainer|Something went wrong, failed to update client", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
@@ -152,7 +152,7 @@ const ClientDetailContainer = (props) =>  {
 			props.history.push("/auth/clients"); // Redirect to the Client list page
 		} catch(e) {
 			console.error(e); // log the error to the browser's console
-			props.app.addAlert("warning", t('ClientDetailContainer|Something went wrong, failed to remove client'));
+			props.app.addAlert("warning", t('ClientDetailContainer|Something went wrong, failed to remove client', {error: e?.response?.data?.message}), 30);
 		}
 	};
 
diff --git a/src/modules/auth/clients/ClientListContainer.js b/src/modules/auth/clients/ClientListContainer.js
index fa644ea8..37868c08 100644
--- a/src/modules/auth/clients/ClientListContainer.js
+++ b/src/modules/auth/clients/ClientListContainer.js
@@ -86,7 +86,7 @@ function ClientListContainer(props) {
 		} catch (e) {
 			console.error(e);
 			setLoading(false);
-			props.app.addAlert("warning", t("ClientListContainer|Failed to fetch clients"));
+			props.app.addAlert("warning", t("ClientListContainer|Failed to fetch clients", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
diff --git a/src/modules/auth/components/CustomDataContainer.js b/src/modules/auth/components/CustomDataContainer.js
index e658895d..ee623102 100644
--- a/src/modules/auth/components/CustomDataContainer.js
+++ b/src/modules/auth/components/CustomDataContainer.js
@@ -83,7 +83,7 @@ export function CustomDataContainer({app, resources, customData, setCustomData,
 			setEdit(false);
 			app.addAlert("success", t("CustomDataContainer|Data updated successfully"));
 		} catch (e) {
-			app.addAlert("warning", t("CustomDataContainer|Something went wrong, failed to update data"));
+			app.addAlert("warning", t("CustomDataContainer|Something went wrong, failed to update data", {error: e?.response?.data?.message}), 30);
 			console.error(e);
 		}
 	}
diff --git a/src/modules/auth/credentials/CredentialsRolesCard.js b/src/modules/auth/credentials/CredentialsRolesCard.js
index 867a7044..6ff60be9 100644
--- a/src/modules/auth/credentials/CredentialsRolesCard.js
+++ b/src/modules/auth/credentials/CredentialsRolesCard.js
@@ -43,7 +43,7 @@ function CredentialsRolesCard(props) {
 			setPrevAssignedRoles(response.data);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsRolesCard|Something went wrong, failed to fetch assigned roles"));
+			props.app.addAlert("warning", t("CredentialsRolesCard|Something went wrong, failed to fetch assigned roles", {error: e?.response?.data?.message}), 30);
 		}
 	};
 
@@ -57,7 +57,7 @@ function CredentialsRolesCard(props) {
 			setRolesLookup(roles);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsRolesCard|Something went wrong, failed to fetch roles"));
+			props.app.addAlert("warning", t("CredentialsRolesCard|Something went wrong, failed to fetch roles", {error: e?.response?.data?.message}), 30);
 		}
 	};
 
@@ -86,7 +86,7 @@ function CredentialsRolesCard(props) {
 			setEditMode(false);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsRolesCard|Failed to update roles"));
+			props.app.addAlert("warning", t("CredentialsRolesCard|Failed to update roles", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
diff --git a/src/modules/auth/credentials/CredentialsSessionCard.js b/src/modules/auth/credentials/CredentialsSessionCard.js
index 9918c200..d7d4d2b7 100644
--- a/src/modules/auth/credentials/CredentialsSessionCard.js
+++ b/src/modules/auth/credentials/CredentialsSessionCard.js
@@ -33,7 +33,7 @@ function CredentialsSessionCard(props) {
 			props.retrieveSessions();
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsSessionCard|Failed to terminate sessions"))
+			props.app.addAlert("warning", t("CredentialsSessionCard|Failed to terminate sessions", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
diff --git a/src/modules/auth/credentials/CredentialsTenantsCard.js b/src/modules/auth/credentials/CredentialsTenantsCard.js
index e112a786..c08052f5 100644
--- a/src/modules/auth/credentials/CredentialsTenantsCard.js
+++ b/src/modules/auth/credentials/CredentialsTenantsCard.js
@@ -60,7 +60,7 @@ function CredentialsTenantsCard(props) {
 			setPrevAssignedTenants(response.data)
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsTenantsCard|Something went wrong, failed to fetch assigned tenants"));
+			props.app.addAlert("warning", t("CredentialsTenantsCard|Something went wrong, failed to fetch assigned tenants", {error: e?.response?.data?.message}), 30);
 		}
 	};
 
@@ -92,7 +92,7 @@ function CredentialsTenantsCard(props) {
 			setAllTenants(eligibleTenants);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsTenantsCard|Something went wrong, failed to fetch tenants"));
+			props.app.addAlert("warning", t("CredentialsTenantsCard|Something went wrong, failed to fetch tenants", {error: e?.response?.data?.message}), 30);
 		}
 	};
 
@@ -106,7 +106,7 @@ function CredentialsTenantsCard(props) {
 			props.setRolesRefresh(prev => !prev);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsRolesCard|Failed to update tenants"));
+			props.app.addAlert("warning", t("CredentialsRolesCard|Failed to update tenants", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
diff --git a/src/modules/auth/credentials/ResetPasswordContainer.js b/src/modules/auth/credentials/ResetPasswordContainer.js
index 18a213a8..90550815 100644
--- a/src/modules/auth/credentials/ResetPasswordContainer.js
+++ b/src/modules/auth/credentials/ResetPasswordContainer.js
@@ -38,7 +38,7 @@ function ResetPasswordContainer(props) {
 			setData(response.data);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("ResetPasswordContainer|Something went wrong, failed to fetch user details"));
+			props.app.addAlert("warning", t("ResetPasswordContainer|Something went wrong, failed to fetch user details", {error: e?.response?.data?.message}), 30);
 		}
 	};
 
@@ -59,7 +59,7 @@ function ResetPasswordContainer(props) {
 						'Content-Type': 'application/json'
 				}});
 			if (response.data.result !== true) {
-				props.app.addAlert("warning", t("ResetPasswordContainer|Something went wrong, failed to reset user's password"));
+				props.app.addAlert("warning", t("ResetPasswordContainer|Something went wrong, failed to reset user's password"), 30);
 				return;
 			}
 			props.app.addAlert("success", t("ResetPasswordContainer|Password has been reset"));
@@ -67,7 +67,7 @@ function ResetPasswordContainer(props) {
 			props.history.push(`/auth/credentials/${credentials_id}`)
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("ResetPasswordContainer|Something went wrong, failed to reset user's password"));
+			props.app.addAlert("warning", t("ResetPasswordContainer|Something went wrong, failed to reset user's password", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
diff --git a/src/modules/auth/resources/ResourcesCreateContainer.js b/src/modules/auth/resources/ResourcesCreateContainer.js
index b6b61bd3..b66077d5 100644
--- a/src/modules/auth/resources/ResourcesCreateContainer.js
+++ b/src/modules/auth/resources/ResourcesCreateContainer.js
@@ -46,7 +46,7 @@ const ResourceCreateContainer = (props) => {
 			props.history.push("/auth/resources");
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("ResourcesCreateContainer|Something went wrong, failed to create resource"));
+			props.app.addAlert("warning", t("ResourcesCreateContainer|Something went wrong, failed to create resource", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
diff --git a/src/modules/auth/resources/ResourcesDetailContainer.js b/src/modules/auth/resources/ResourcesDetailContainer.js
index cdc4403b..41262ba9 100644
--- a/src/modules/auth/resources/ResourcesDetailContainer.js
+++ b/src/modules/auth/resources/ResourcesDetailContainer.js
@@ -32,7 +32,7 @@ const ResourceDetailContainer = (props) =>  {
 			setResource(response.data);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("ResourcesDetailContainer|Something went wrong, can't fetch resource details"));
+			props.app.addAlert("warning", t("ResourcesDetailContainer|Something went wrong, can't fetch resource details", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
@@ -60,7 +60,7 @@ const ResourceDetailContainer = (props) =>  {
 			getResourceDetail();
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("ResourcesDetailContainer|Something went wrong, failed to update resource"));
+			props.app.addAlert("warning", t("ResourcesDetailContainer|Something went wrong, failed to update resource", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
diff --git a/src/modules/auth/resources/ResourcesListContainer.js b/src/modules/auth/resources/ResourcesListContainer.js
index 71cf3133..d1058efa 100644
--- a/src/modules/auth/resources/ResourcesListContainer.js
+++ b/src/modules/auth/resources/ResourcesListContainer.js
@@ -65,7 +65,7 @@ function ResourcesListContainer(props) {
 		} catch(e) {
 			console.error(e);
 			setLoading(false);
-			props.app.addAlert("warning", t("ResourcesListContainer|Something went wrong, failed to load resources"));
+			props.app.addAlert("warning", t("ResourcesListContainer|Something went wrong, failed to load resources", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
diff --git a/src/modules/auth/roles/RolesCreateContainer.js b/src/modules/auth/roles/RolesCreateContainer.js
index 4747633c..05149b39 100644
--- a/src/modules/auth/roles/RolesCreateContainer.js
+++ b/src/modules/auth/roles/RolesCreateContainer.js
@@ -39,7 +39,7 @@ const RolesCreateContainer = (props) => {
 			props.history.push(`/auth/roles/${tenant}/${values.roleName}`);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("RolesCreateContainer|Something went wrong, role has not been created"));
+			props.app.addAlert("warning", t("RolesCreateContainer|Something went wrong, role has not been created", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
diff --git a/src/modules/auth/roles/RolesDetailContainer.js b/src/modules/auth/roles/RolesDetailContainer.js
index 40df9cf2..565fe2de 100644
--- a/src/modules/auth/roles/RolesDetailContainer.js
+++ b/src/modules/auth/roles/RolesDetailContainer.js
@@ -124,7 +124,7 @@ const RolesDetailContainer = (props) =>  {
 			setRole(response.data);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("RolesDetailContainer|Something went wrong, failed to fetch role detail"));
+			props.app.addAlert("warning", t("RolesDetailContainer|Something went wrong, failed to fetch role detail", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
@@ -135,7 +135,7 @@ const RolesDetailContainer = (props) =>  {
 			props.history.push("/auth/roles");
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("RolesDetailContainer|Failed to remove the role"))
+			props.app.addAlert("warning", t("RolesDetailContainer|Failed to remove the role", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
@@ -161,7 +161,7 @@ const RolesDetailContainer = (props) =>  {
 		} catch(e) {
 			console.error(e);
 			setLoading(false);
-			props.app.addAlert("warning", t("RolesDetailContainer|Something went wrong, failed to fetch assigned credentials"));
+			props.app.addAlert("warning", t("RolesDetailContainer|Something went wrong, failed to fetch assigned credentials", {error: e?.response?.data?.message}), 30);
 		}
 	};
 
@@ -179,10 +179,10 @@ const RolesDetailContainer = (props) =>  {
 			console.error(e);
 			setLoading(false);
 			if (e.response.status === 401) {
-				props.app.addAlert("warning", t("RolesDetailContainer|Can't fetch the data, you don't have rights to display it"));
+				props.app.addAlert("warning", t("RolesDetailContainer|Can't fetch the data, you don't have rights to display it"), 30);
 				return;
 			}
-			props.app.addAlert("warning", t("RolesDetailContainer|Something went wrong, failed to fetch data"));
+			props.app.addAlert("warning", t("RolesDetailContainer|Something went wrong, failed to fetch data", {error: e?.response?.data?.message}), 30);
 		}
 	};
 
@@ -197,10 +197,10 @@ const RolesDetailContainer = (props) =>  {
 			retrieveAssignedCredentials();
 		} catch(e) {
 			if (e.response?.data?.result === "ALREADY-EXISTS") {
-				props.app.addAlert("warning", t("RolesDetailContainer|The selected credential has already been assigned"));
+				props.app.addAlert("warning", t("RolesDetailContainer|The selected credential has already been assigned"), 30);
 			} else {
 				console.error(e);
-				props.app.addAlert("warning", t("RolesDetailContainer|Something went wrong, the credentials cannot be assigned"));
+				props.app.addAlert("warning", t("RolesDetailContainer|Something went wrong, the credentials cannot be assigned", {error: e?.response?.data?.message}), 30);
 			}
 		}
 	};
@@ -217,7 +217,7 @@ const RolesDetailContainer = (props) =>  {
 
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("RolesDetailContainer|Something went wrong, the credentials cannot be unassigned"));
+			props.app.addAlert("warning", t("RolesDetailContainer|Something went wrong, the credentials cannot be unassigned", {error: e?.response?.data?.message}), 30);
 		}
 	};
 
diff --git a/src/modules/auth/roles/RolesListContainer.js b/src/modules/auth/roles/RolesListContainer.js
index 8ecd3fc1..dfb35c78 100644
--- a/src/modules/auth/roles/RolesListContainer.js
+++ b/src/modules/auth/roles/RolesListContainer.js
@@ -82,7 +82,7 @@ const RolesListcontainer = (props) => {
 		} catch(e) {
 			console.error(e);
 			setLoading(false);
-			props.app.addAlert("warning", t("RolesListContainer|Something went wrong, failed to fetch roles"));
+			props.app.addAlert("warning", t("RolesListContainer|Something went wrong, failed to fetch roles", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
diff --git a/src/modules/auth/roles/RolesResourcesCard.js b/src/modules/auth/roles/RolesResourcesCard.js
index 27eea71c..8fe2136c 100644
--- a/src/modules/auth/roles/RolesResourcesCard.js
+++ b/src/modules/auth/roles/RolesResourcesCard.js
@@ -31,7 +31,7 @@ const RolesResourcesCard = (props) => {
 				const assignedResources = res.data.resources;
 				setAssignedResources(assignedResources);
 			})
-			.catch(() => props.app.addAlert("warning", t("RolesResourcesCard|Fetch of assigned resources failed")));
+			.catch((e) => props.app.addAlert("warning", t("RolesResourcesCard|Fetch of assigned resources failed", {error: e?.response?.data?.message}), 30));
 		if (editMode) setEditMode(false);
 	}
 
@@ -46,7 +46,7 @@ const RolesResourcesCard = (props) => {
 				}
 				setUnassignedResources(unassignedResources);
 			})
-			.catch(() => props.app.addAlert("warning", t("RolesResourcesCard|Fetch of all resources failed")));
+			.catch((e) => props.app.addAlert("warning", t("RolesResourcesCard|Fetch of all resources failed", {error: e?.response?.data?.message}), 30));
 	}
 
 	const assignResource = (resource) => {
@@ -66,7 +66,7 @@ const RolesResourcesCard = (props) => {
 			setEditMode(false);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("RolesResourcesCard|Update of the role has failed"));
+			props.app.addAlert("warning", t("RolesResourcesCard|Update of the role has failed", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
diff --git a/src/modules/auth/session/SessionDetailContainer.js b/src/modules/auth/session/SessionDetailContainer.js
index 87e6fe78..f319e23b 100644
--- a/src/modules/auth/session/SessionDetailContainer.js
+++ b/src/modules/auth/session/SessionDetailContainer.js
@@ -77,7 +77,7 @@ function SessionDetailContainer(props) {
 			setData(response.data);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("SessionDetailContainer|Failed to fetch details"));
+			props.app.addAlert("warning", t("SessionDetailContainer|Failed to fetch details", {error: e?.response?.data?.message}), 30);
 		}
 	};
 
@@ -100,7 +100,7 @@ function SessionDetailContainer(props) {
 			history.goBack();
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("SessionDetailContainer|Failed to terminate the session"));
+			props.app.addAlert("warning", t("SessionDetailContainer|Failed to terminate the session", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
diff --git a/src/modules/auth/session/SessionListContainer.js b/src/modules/auth/session/SessionListContainer.js
index 4d65ed76..e284b367 100644
--- a/src/modules/auth/session/SessionListContainer.js
+++ b/src/modules/auth/session/SessionListContainer.js
@@ -95,10 +95,10 @@ const SessionListContainer = (props) => {
 		} catch(e) {
 			if (e.response.status == 403) {
 				console.error(e);
-				props.app.addAlert("warning", t("SessionListContainer|Access denied, you do not have a right to perform this action"));
+				props.app.addAlert("warning", t("SessionListContainer|Access denied, you do not have a right to perform this action"), 30);
 			} else {
 				console.error(e);
-				props.app.addAlert("warning", t("SessionListContainer|Failed to fetch the object"));
+				props.app.addAlert("warning", t("SessionListContainer|Failed to fetch the object", {error: e?.response?.data?.message}), 30);
 			}
 			setLoading(false);
 		}
@@ -131,7 +131,7 @@ const SessionListContainer = (props) => {
 			retrieveData();
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("SessionListContainer|Failed to terminate the session"));
+			props.app.addAlert("warning", t("SessionListContainer|Failed to terminate the session", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
@@ -149,7 +149,7 @@ const SessionListContainer = (props) => {
 			}, 5000)
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("SessionListContainer|Failed to terminate all sessions"));
+			props.app.addAlert("warning", t("SessionListContainer|Failed to terminate all sessions", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
diff --git a/src/modules/auth/tenant/TenantCreateContainer.js b/src/modules/auth/tenant/TenantCreateContainer.js
index ba545e55..e8f2f15c 100644
--- a/src/modules/auth/tenant/TenantCreateContainer.js
+++ b/src/modules/auth/tenant/TenantCreateContainer.js
@@ -41,7 +41,7 @@ function TenantCreateContainer(props) {
 			props.history.push("/auth/tenant");
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("TenantCreateContainer|Something went wrong, failed to create tenant"));
+			props.app.addAlert("warning", t("TenantCreateContainer|Something went wrong, failed to create tenant", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
@@ -51,7 +51,7 @@ function TenantCreateContainer(props) {
 			setValue('id', response.data.tenant_id);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("TenantCreateContainer|Something went wrong, can't propose tenant name"));
+			props.app.addAlert("warning", t("TenantCreateContainer|Something went wrong, can't propose tenant name", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
diff --git a/src/modules/auth/tenant/TenantDetailContainer.js b/src/modules/auth/tenant/TenantDetailContainer.js
index 8439f3e4..3d939f58 100644
--- a/src/modules/auth/tenant/TenantDetailContainer.js
+++ b/src/modules/auth/tenant/TenantDetailContainer.js
@@ -136,7 +136,7 @@ function TenantDetailContainer(props) {
 		} catch (e) {
 			console.error(e);
 			setLoadingCustomData(false);
-			props.app.addAlert("warning", t("TenantDetailContainer|Something went wrong, failed to fetch tenant detail"));
+			props.app.addAlert("warning", t("TenantDetailContainer|Something went wrong, failed to fetch tenant detail", {error: e?.response?.data?.message}), 30);
 		}
 	};
 
@@ -149,7 +149,7 @@ function TenantDetailContainer(props) {
 			setUsername(response.data.data[data.created_by]);
 		} catch (e) {
 			console.error(e);
-			props.app.addAlert("warning", t("TenantDetailContainer|Something went wrong, failed to fetch assigned credentials"));
+			props.app.addAlert("warning", t("TenantDetailContainer|Something went wrong, failed to fetch assigned credentials", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
@@ -170,7 +170,7 @@ function TenantDetailContainer(props) {
 		} catch (e) {
 			console.error(e);
 			setLoading(false);
-			props.app.addAlert("warning", t("TenantDetailContainer|Something went wrong, failed to fetch assigned credentials"));
+			props.app.addAlert("warning", t("TenantDetailContainer|Something went wrong, failed to fetch assigned credentials", {error: e?.response?.data?.message}), 30);
 		}
 	};
 
@@ -184,7 +184,7 @@ function TenantDetailContainer(props) {
 			props.history.push("/auth/tenant");
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("TenantDetailContainer|Failed to remove the tenant"));
+			props.app.addAlert("warning", t("TenantDetailContainer|Failed to remove the tenant", {error: e?.response?.data?.message}), 30);
 		}
 	}
 
@@ -202,10 +202,10 @@ function TenantDetailContainer(props) {
 			console.error(e);
 			setLoading(false);
 			if (e.response.status === 401) {
-				props.app.addAlert("warning", t("TenantDetailContainer|Can't fetch the data, you don't have rights to display it"));
+				props.app.addAlert("warning", t("TenantDetailContainer|Can't fetch the data, you don't have rights to display it"), 30);
 				return;
 			}
-			props.app.addAlert("warning", t("TenantDetailContainer|Something went wrong, failed to fetch data"));
+			props.app.addAlert("warning", t("TenantDetailContainer|Something went wrong, failed to fetch data", {error: e?.response?.data?.message}), 30);
 		}
 	};
 
@@ -222,10 +222,10 @@ function TenantDetailContainer(props) {
 
 		} catch(e) {
 			if (e.response?.data?.result === "ALREADY-EXISTS") {
-				props.app.addAlert("warning", t("TenantDetailContainer|The selected credential has already been assigned"));
+				props.app.addAlert("warning", t("TenantDetailContainer|The selected credential has already been assigned"), 30);
 			} else {
 				console.error(e);
-				props.app.addAlert("warning", t("TenantDetailContainer|Something went wrong, the credentials cannot be assigned"));
+				props.app.addAlert("warning", t("TenantDetailContainer|Something went wrong, the credentials cannot be assigned", {error: e?.response?.data?.message}), 30);
 			}
 		}
 	};
@@ -242,7 +242,7 @@ function TenantDetailContainer(props) {
 
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("TenantDetailContainer|Something went wrong, the credentials cannot be unassigned"));
+			props.app.addAlert("warning", t("TenantDetailContainer|Something went wrong, the credentials cannot be unassigned", {error: e?.response?.data?.message}), 30);
 		}
 	};
 
diff --git a/src/modules/auth/tenant/TenantListContainer.js b/src/modules/auth/tenant/TenantListContainer.js
index 2fb92f3e..523c6c31 100644
--- a/src/modules/auth/tenant/TenantListContainer.js
+++ b/src/modules/auth/tenant/TenantListContainer.js
@@ -62,7 +62,7 @@ function TenantListContainer(props) {
 		} catch(e) {
 			console.error(e);
 			setLoading(false);
-			props.app.addAlert("warning", t("TenantListContainer|Failed to fetch tenants"));
+			props.app.addAlert("warning", t("TenantListContainer|Failed to fetch tenants", {error: e?.response?.data?.message}), 30);
 		}
 	}
 

From 4fa7cb9f1624dfbbf672d730e1eee9448ae0222b Mon Sep 17 00:00:00 2001
From: Pe5h4 <pesekf@email.cz>
Date: Tue, 10 Jan 2023 14:40:25 +0100
Subject: [PATCH 14/19] Update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fa35c95..28891242 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,12 +6,16 @@
 
 - ASAB WebUI submodule version bump [[0b97139](https://github.com/TeskaLabs/asab-webui/commit/0b97139df1c2dc0e4e82dd97fd5593334efc5d38)] commit (INDIGO Sprint 230106, [!13](https://github.com/TeskaLabs/seacat-admin-webui/pull/13))
 
+- Create invitation components (INDIGO Sprint 230106, [!8](https://github.com/TeskaLabs/seacat-admin-webui/pull/8))
+
 ### Refactoring
 
 - Add new input `preferred_client_id` to ClientCreateContainer (INDIGO Sprint 221209, [!7](https://github.com/TeskaLabs/seacat-admin-webui/pull/7))
 
 - Replace `phone_number` with `phone` and `preferred_username` with `username` (INDIGO Sprint 221209, [!10](https://github.com/TeskaLabs/seacat-admin-webui/pull/10))
 
+- Update alert responses with full message from the service and prolong the time of the error message to 30s (INDIGO Sprint 230106, [!8](https://github.com/TeskaLabs/seacat-admin-webui/pull/8))
+
 ## v22.48
 
 ### Compatibility

From 4efb062343891624ea84fe5138d2ffcc4be308a1 Mon Sep 17 00:00:00 2001
From: Pe5h4 <pesekf@email.cz>
Date: Wed, 11 Jan 2023 10:24:09 +0100
Subject: [PATCH 15/19] Comment in expiration setup

---
 src/modules/auth/credentials/CredentialsCreateContainer.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/modules/auth/credentials/CredentialsCreateContainer.js b/src/modules/auth/credentials/CredentialsCreateContainer.js
index ca7861d7..fac259af 100644
--- a/src/modules/auth/credentials/CredentialsCreateContainer.js
+++ b/src/modules/auth/credentials/CredentialsCreateContainer.js
@@ -132,8 +132,8 @@ function CredentialsCreateContainer(props) {
 	const onInvite = async (values) => {
 		let body = {};
 		let credentials = {};
-		// TODO: Allow setting up the expiration by admin and use differerent default
-		let expiration = 999999999;
+		// TODO: Allow setting up the expiration by admin (default is defined within service config)
+		// let expiration = 999999999;
 
 		// Fill credentials key with filled values
 		Promise.all(Object.keys(values).map((key, i) => {
@@ -143,7 +143,8 @@ function CredentialsCreateContainer(props) {
 		}))
 
 		body["credentials"] = credentials;
-		body["expiration"] = expiration;
+		// TODO: Allow setting up the expiration by admin
+		// body["expiration"] = expiration;
 
 		let response;
 		try {

From e006fdaddb4dbded14cbcc463dd43684316f8a15 Mon Sep 17 00:00:00 2001
From: Pe5h4 <pesekf@email.cz>
Date: Mon, 23 Jan 2023 12:56:47 +0100
Subject: [PATCH 16/19] REfactor error responses

---
 public/locales/cs/translation.json            | 112 +++++++++---------
 public/locales/en/translation.json            | 112 +++++++++---------
 .../auth/clients/ClientCreateContainer.js     |   4 +-
 .../auth/clients/ClientDetailContainer.js     |   8 +-
 .../auth/clients/ClientListContainer.js       |   2 +-
 .../auth/components/CustomDataContainer.js    |   2 +-
 .../credentials/CredentialsCreateContainer.js |   6 +-
 .../credentials/CredentialsDetailContainer.js |  14 +--
 .../credentials/CredentialsListContainer.js   |   6 +-
 .../auth/credentials/CredentialsRolesCard.js  |   6 +-
 .../credentials/CredentialsSessionCard.js     |   2 +-
 .../credentials/CredentialsTenantsCard.js     |   6 +-
 .../credentials/ResetPasswordContainer.js     |   4 +-
 .../resources/ResourcesCreateContainer.js     |   2 +-
 .../resources/ResourcesDetailContainer.js     |   4 +-
 .../auth/resources/ResourcesListContainer.js  |   2 +-
 .../auth/roles/RolesCreateContainer.js        |   2 +-
 .../auth/roles/RolesDetailContainer.js        |  12 +-
 src/modules/auth/roles/RolesListContainer.js  |   2 +-
 src/modules/auth/roles/RolesResourcesCard.js  |   6 +-
 .../auth/session/SessionDetailContainer.js    |   4 +-
 .../auth/session/SessionListContainer.js      |   6 +-
 .../auth/tenant/TenantCreateContainer.js      |   4 +-
 .../auth/tenant/TenantDetailContainer.js      |  14 +--
 .../auth/tenant/TenantListContainer.js        |   2 +-
 25 files changed, 172 insertions(+), 172 deletions(-)

diff --git a/public/locales/cs/translation.json b/public/locales/cs/translation.json
index cedcc6a9..561a660f 100644
--- a/public/locales/cs/translation.json
+++ b/public/locales/cs/translation.json
@@ -84,16 +84,16 @@
 	},
 	"ClientListContainer": {
 		"Application type": "Typ aplikace",
-		"Failed to fetch clients": "Nepodařilo se načíst klienty. {{error}}",
+		"Failed to fetch clients": "Nepodařilo se načíst klienty",
 		"Client name": "Název klienta",
 		"New client": "Nový klient",
 		"Clients": "Klienti",
 		"Search": "Vyhledat"
 	},
 	"ClientCreateContainer": {
-		"Something went wrong, failed to fetch clients": "Něco je špatně, nepodařilo se získat klienty. {{error}}",
+		"Something went wrong, failed to fetch clients": "Něco je špatně, nepodařilo se získat klienty",
 		"Client has been created": "Klient byl vytvořen",
-		"Something went wrong, client has not been created": "Něco je špatně, klient nebyl vytvořen. {{error}}",
+		"Something went wrong, client has not been created": "Něco je špatně, klient nebyl vytvořen",
 		"Create new client": "Vytvořit nového klienta",
 		"Template": "Šablona",
 		"Client name": "Název klienta",
@@ -108,15 +108,15 @@
 		"Unknown item": "Neznámá položka"
 	},
 	"ClientDetailContainer": {
-		"Something went wrong, failed to fetch client details": "Něco je špatně, nepodařilo se získat detail klienta. {{error}}",
+		"Something went wrong, failed to fetch client details": "Něco je špatně, nepodařilo se získat detail klienta",
 		"Secret has been reset successfully": "Heslo bylo úspěšně resetováno",
-		"Something went wrong, failed to reset secret": "Reset hesla se nezdařil. {{error}}",
+		"Something went wrong, failed to reset secret": "Reset hesla se nezdařil",
 		"Do you want to reset this secret?": "Přejete si resetovat toto heslo?",
-		"Something went wrong, failed to update client": "Něco je špatně, nepodařilo se aktualizovat klienta. {{error}}",
+		"Something went wrong, failed to update client": "Něco je špatně, nepodařilo se aktualizovat klienta",
 		"Do you want to remove this client?": "Chcete odstranit tohoto klienta?",
 		"Client removed successfully": "Klient úspěšně odstraněn",
 		"Client updated successfully": "Klient úspěšně aktualizován",
-		"Something went wrong, failed to remove client": "Něco je špatně, nepodařilo se odstranit klienta. {{error}}",
+		"Something went wrong, failed to remove client": "Něco je špatně, nepodařilo se odstranit klienta",
 		"Client": "Klient",
 		"Client name": "Název klienta",
 		"Client ID": "ID klienta",
@@ -145,13 +145,13 @@
 		"Provider": "Provider",
 		"Create credentials": "Vytvořit údaje",
 		"Credentials have been created successfully": "Údaje byly úspěšně vytvořeny",
-		"Something went wrong, failed to create credentials": "Něco je špatně, údaje nebyly vytvořeny. {{error}}",
-		"Something went wrong, failed to fetch providers": "Něco je špatně, získání providerů selhalo. {{error}}",
+		"Something went wrong, failed to create credentials": "Něco je špatně, údaje nebyly vytvořeny",
+		"Something went wrong, failed to fetch providers": "Něco je špatně, získání providerů selhalo",
 		"Create": "Vytvořit",
 		"Invite": "Pozvat",
 		"Invite user": "Pozvat uživatele",
 		"Invitation sent successfully": "Pozvánka úspěšně odeslána",
-		"Something went wrong, failed to send invitation": "Něco je špatně, pozvánka nebyla odeslána. {{error}}"
+		"Something went wrong, failed to send invitation": "Něco je špatně, pozvánka nebyla odeslána"
 	},
 	"CredentialsDetailContainer": {
 		"Credentials": "Uživatelské údaje",
@@ -173,19 +173,19 @@
 		"Do you want to remove this user?": "Opravdu chcete odstranit tohoto uživatele?",
 		"Do you want to suspend this user?": "Opravdu chcete suspendovat tohoto uživatele?",
 		"Do you want to activate this user?": "Opravdu chcete aktivovat tohoto uživatele?",
-		"Something went wrong, failed to fetch user details": "Něco je špatně, nepodařilo se získat detaily uživatele. {{error}}",
-		"Something went wrong, failed to fetch user sessions": "Něco je špatně, nepodařilo se získat relace uživatele. {{error}}",
-		"Something went wrong, failed to remove user": "Něco je špatně, nepodařilo se odstranit uživatele. {{error}}",
+		"Something went wrong, failed to fetch user details": "Něco je špatně, nepodařilo se získat detaily uživatele",
+		"Something went wrong, failed to fetch user sessions": "Něco je špatně, nepodařilo se získat relace uživatele",
+		"Something went wrong, failed to remove user": "Něco je špatně, nepodařilo se odstranit uživatele",
 		"User removed successfully": "Uživatel úspěšně odstraněn",
-		"Something went wrong, failed to update user": "Něco je špatně, nepodařilo se aktualizovat uživatele. {{error}}",
+		"Something went wrong, failed to update user": "Něco je špatně, nepodařilo se aktualizovat uživatele",
 		"User has been updated successfully": "Uživatel úspěšně aktualizován",
 		"Phone number already in use": "Telefonní číslo je již použito",
 		"Email address already in use": "Emailová adresa je již použita",
-		"Something went wrong, failed to fetch provider data": "Něco je špatně, nepodařilo se získat data provideru. {{error}}",
+		"Something went wrong, failed to fetch provider data": "Něco je špatně, nepodařilo se získat data provideru",
 		"Information editing is not allowed within this credentials": "V rámci těchto uživatelských údajů není povolena úprava informací",
 		"Invited": "Pozván",
 		"Resend invitation": "Přeposlat pozvánku",
-		"Something went wrong, failed to resend invitation": "Něco je špatně, pozvánka nebyla odeslána. {{error}}",
+		"Something went wrong, failed to resend invitation": "Něco je špatně, pozvánka nebyla odeslána",
 		"Invitation sent successfully": "Pozvánka úspěšně odeslána"
 	},
 	"CredentialsRolesCard": {
@@ -193,18 +193,18 @@
 		"Assign a new role": "Přidat novou roli",
 		"Select role to assign ...": "Vyberte roli k přiřazení ...",
 		"Roles updated successfully": "Role úspěšně aktualizované",
-		"Failed to update roles": "Role se nepodařilo aktualizovat. {{error}}",
-		"Something went wrong, failed to fetch roles": "Něco je špatně, nepodařilo se získat role. {{error}}",
-		"Something went wrong, failed to fetch assigned roles": "Něco je špatně, nepodařilo se získat přiřazené role. {{error}}"
+		"Failed to update roles": "Role se nepodařilo aktualizovat",
+		"Something went wrong, failed to fetch roles": "Něco je špatně, nepodařilo se získat role",
+		"Something went wrong, failed to fetch assigned roles": "Něco je špatně, nepodařilo se získat přiřazené role"
 	},
 	"CredentialsTenantsCard": {
 		"Tenants": "Tenanti",
 		"Assign a tenant": "Přiřadit tenanta",
 		"Search": "Vyhledat",
 		"Tenants updated successfully": "Tenanti úspěšně aktualizováni",
-		"Failed to update tenants": "Tenanty se nepodařilo aktualizovat. {{error}}",
-		"Something went wrong, failed to fetch tenants": "Něco je špatně, nepodařilo se získat tenanty. {{error}}",
-		"Something went wrong, failed to fetch assigned tenants": "Něco je špatně, nepodařilo se získat přiřazené tenanty. {{error}}",
+		"Failed to update tenants": "Tenanty se nepodařilo aktualizovat",
+		"Something went wrong, failed to fetch tenants": "Něco je špatně, nepodařilo se získat tenanty",
+		"Something went wrong, failed to fetch assigned tenants": "Něco je špatně, nepodařilo se získat přiřazené tenanty",
 		"No match": "Shoda nenalezena"
 	},
 	"CredentialsSessionCard": {
@@ -215,7 +215,7 @@
 		"Do you want to terminate user sessions?": "Opravdu chcete ukončit relace uživatele?",
 		"Sessions successfully terminated": "Relace úspěšně ukončeny",
 		"Something went wrong when terminating sessions": "Něco se pokazilo při ukončování relací",
-		"Failed to terminate sessions": "Nepodařilo se ukončit relace. {{error}}"
+		"Failed to terminate sessions": "Nepodařilo se ukončit relace"
 	},
 	"CredentialsListContainer": {
 		"Credentials": "Uživatelské údaje",
@@ -227,7 +227,7 @@
 		"Search": "Hledat",
 		"Tenants": "Tenanti",
 		"Roles": "Role",
-		"Something went wrong, failed to fetch data": "Něco je špatně, nepodařilo se získat data. {{error}}",
+		"Something went wrong, failed to fetch data": "Něco je špatně, nepodařilo se získat data",
 		"Can't fetch the data, you don't have rights to display it": "Nepodařilo se získat data, nemáte dostatečná oprávnění k jejich zobrazení",
 		"Credentials invited": "Uživatel pozván"
 	},
@@ -263,30 +263,30 @@
 		"Username": "Uživatelské jméno",
 		"ID": "ID",
 		"Password has been reset": "Heslo bylo obnoveno",
-		"Something went wrong, failed to reset user's password": "Něco je špatně, nepodařilo se obnovit heslo. {{error}}",
+		"Something went wrong, failed to reset user's password": "Něco je špatně, nepodařilo se obnovit heslo",
 		"Specify password": "Specifikovat heslo",
 		"New password": "Nové heslo",
 		"Password cannot be empty!": "Heslo nemůže být prázdné!",
 		"Do you want to reset password for this user?": "Opravdu chcete obnovit heslo pro tohoto uživatele?",
-		"Something went wrong, failed to fetch user details": "Něco je špatně, nepodařilo se získat data uživatele. {{error}}"
+		"Something went wrong, failed to fetch user details": "Něco je špatně, nepodařilo se získat data uživatele"
 	},
 	"RolesListContainer": {
 		"Roles overview": "Přehled rolí",
 		"Create role": "Vytvořit roli",
 		"Role": "Role",
-		"Something went wrong, failed to fetch roles": "Něco je špatně, nepodařilo se získat role. {{error}}"
+		"Something went wrong, failed to fetch roles": "Něco je špatně, nepodařilo se získat role"
 	},
 	"RolesDetailContainer": {
 		"Role removed successfully": "Role úspěšně odstraněna",
-		"Failed to remove the role": "Nepodařilo se odstranit roli. {{error}}",
+		"Failed to remove the role": "Nepodařilo se odstranit roli",
 		"Role": "Role",
 		"Remove role": "Odstranit roli",
 		"Do you want to remove the role?": "Chcete tuto roli odebrat?",
-		"Something went wrong, failed to fetch role detail": "Něco je špatně, nepodařilo se získat detail role. {{error}}",
-		"Something went wrong, failed to fetch data": "Něco je špatně, nepodařilo se získat data. {{error}}",
+		"Something went wrong, failed to fetch role detail": "Něco je špatně, nepodařilo se získat detail role",
+		"Something went wrong, failed to fetch data": "Něco je špatně, nepodařilo se získat data",
 		"Can't fetch the data, you don't have rights to display it": "Nepodařilo se získat data, nemáte dostatečná oprávnění k jejich zobrazení",
-		"Something went wrong, the credentials cannot be assigned": "Něco je špatně, nepodařilo se přiřadit uživatele. {{error}}",
-		"Something went wrong, the credentials cannot be unassigned": "Něco je špatně, nepodařilo se odebrat uživatele. {{error}}",
+		"Something went wrong, the credentials cannot be assigned": "Něco je špatně, nepodařilo se přiřadit uživatele",
+		"Something went wrong, the credentials cannot be unassigned": "Něco je špatně, nepodařilo se odebrat uživatele",
 		"The selected credential has already been assigned": "Vybraný uživatel byl již přiřazen",
 		"Unable to assign credentials": "Nepodařilo se přiřadit uživatele",
 		"Unable to unassign credentials": "Nepodařilo se odebrat uživatele",
@@ -297,7 +297,7 @@
 		"Unassign credentials": "Odebrat uživatele",
 		"Do you want to unassign these credentials?": "Opravdu chcete odebrat uživatele?",
 		"Credentials suspended": "Uživatel suspendován",
-		"Something went wrong, failed to fetch assigned credentials": "Něco je špatně, nepodařilo se získat přiřazené uživatelské údaje. {{error}}",
+		"Something went wrong, failed to fetch assigned credentials": "Něco je špatně, nepodařilo se získat přiřazené uživatelské údaje",
 		"Assign credentials": "Přiřadit uživatelské údaje",
 		"Assigned credentials": "Přiřazené uživatelské údaje"
 	},
@@ -313,13 +313,13 @@
 		"Invalid format, only letters, numbers, dash and underscore are allowed": "Nesprávný formát, pouze písmena, číslice, pomlčka a podtržítko jsou povoleny",
 		"Invalid format": "Nesprávný formát:",
 		"Only letters, numbers, dash and underscore are allowed": "Pouze písmena, číslice, pomlčka a podtržítko jsou povoleny",
-		"Something went wrong, role has not been created": "Něco je špatně, role nebyla vytvořena. {{error}}"
+		"Something went wrong, role has not been created": "Něco je špatně, role nebyla vytvořena"
 	},
 	"RolesResourcesCard": {
-		"Fetch of all resources failed": "Nepodařilo se načíst všechny zdroje. {{error}}",
-		"Fetch of assigned resources failed": "Nepodařilo se načíst přiřazené zdroje. {{error}}",
+		"Fetch of all resources failed": "Nepodařilo se načíst všechny zdroje",
+		"Fetch of assigned resources failed": "Nepodařilo se načíst přiřazené zdroje",
 		"Role has been updated successfully": "Aktualizace role proběhla úspěšně",
-		"Update of the role has failed": "Aktualizace role se nezdařila. {{error}}",
+		"Update of the role has failed": "Aktualizace role se nezdařila",
 		"Assigned resources": "Přiřazené zdroje",
 		"Add resource": "Přidat zdroj",
 		"Select resource": "Vyberte zdroj",
@@ -341,44 +341,44 @@
 		"Invalid format, resource cannot start with a underscore": "Nesprávný formát, zdroj nemůže začínat podtržítkem",
 		"Invalid format, only lower-case letters, numbers, dash and underscore are allowed": "Nesprávný formát, pouze malá písmena, číslice, pomlčka a podtržítko jsou povoleny",
 		"Only lower-case letters, numbers, dash and underscore are allowed": "Pouze malá písmena, číslice, pomlčka a podtržítko jsou povoleny",
-		"Something went wrong, failed to create resource": "Něco je špatně, nepodařilo se vytvořit zdroj. {{error}}"
+		"Something went wrong, failed to create resource": "Něco je špatně, nepodařilo se vytvořit zdroj"
 	},
 	"ResourcesDetailContainer": {
 		"Resource": "Zdroj",
 		"Resource updated successfully": "Zdroj byl úspěšně aktualizován",
-		"Something went wrong, can't fetch resource details": "Něco je špatně, nepodařilo se načíst zdroj. {{error}}",
-		"Something went wrong, failed to update resource": "Něco je špatně, aktualizace zdroje se nezdařila. {{error}}"
+		"Something went wrong, can't fetch resource details": "Něco je špatně, nepodařilo se načíst zdroj",
+		"Something went wrong, failed to update resource": "Něco je špatně, aktualizace zdroje se nezdařila"
 	},
 	"ResourcesListContainer": {
 		"Resources list": "Seznam zdrojů",
 		"Create resource": "Vytvořit zdroj",
-		"Something went wrong, failed to load resources": "Něco je špatně, nepodařilo se načíst zdroje. {{error}}"
+		"Something went wrong, failed to load resources": "Něco je špatně, nepodařilo se načíst zdroje"
 	},
 	"SessionListContainer": {
 		"Credentials": "Uživ. Identifikace",
-		"Failed to fetch the object": "Nepodařilo se načíst objekt. {{error}}",
+		"Failed to fetch the object": "Nepodařilo se načíst objekt",
 		"Sessions": "Relace",
 		"Expected expiration": "Očekávané vypršení platnosti",
 		"Terminate session": "Ukončit relaci",
 		"Do you want to terminate this session?": "Opravdu chcete ukončit tuto relaci?",
 		"Session successfully terminated": "Relace úspěšně ukončena",
 		"Something went wrong when terminating session": "Něco se pokazilo při ukončování relace",
-		"Failed to terminate the session": "Nepodařilo se ukončit relaci. {{error}}",
+		"Failed to terminate the session": "Nepodařilo se ukončit relaci",
 		"Terminate all sessions": "Ukončit všechny relace",
 		"Terminate all": "Ukončit vše",
 		"Do you want to terminate all sessions?": "Opravdu chcete ukončit všechny relace?",
 		"All sessions successfully terminated": "Všechny relace úspěšně ukončeny",
 		"Something went wrong when terminating all sessions": "Něco se pokazilo při ukončování všech relací",
-		"Failed to terminate all sessions": "Nepodařilo se ukončit všechny relace. {{error}}",
+		"Failed to terminate all sessions": "Nepodařilo se ukončit všechny relace",
 		"Access denied, you do not have a right to perform this action": "Přístup odepřen, nemáte dostatečná oprávnění",
 		"Session": "Relace"
 	},
 	"SessionDetailContainer": {
-		"Failed to fetch details": "Nepodařilo se načíst relace. {{error}}",
+		"Failed to fetch details": "Nepodařilo se načíst relace",
 		"Do you want to terminate this session?": "Opravdu chcete ukončit tuto relaci?",
 		"Session successfully terminated": "Relace úspěšně ukončena",
 		"Something went wrong when terminating session": "Něco se pokazilo při ukončování relace",
-		"Failed to terminate the session": "Nepodařilo se ukončit relaci. {{error}}",
+		"Failed to terminate the session": "Nepodařilo se ukončit relaci",
 		"Session": "Relace",
 		"Terminate session": "Ukončit relaci",
 		"Session ID": "ID relace",
@@ -391,7 +391,7 @@
 		"Authorization": "Autorizace"
 	},
 	"TenantListContainer": {
-		"Failed to fetch tenants": "Nepodařilo se načíst tenanty. {{error}}",
+		"Failed to fetch tenants": "Nepodařilo se načíst tenanty",
 		"Tenants": "Tenanti",
 		"New tenant": "Nový tenant"
 	},
@@ -405,7 +405,7 @@
 		"No changes were made": "Nebyly provedeny žádné změny",
 		"Remove input": "Odstranit pole",
 		"Nothing to remove": "Žádná data k vymazání",
-		"Something went wrong, failed to update data": "Něco je špatně, nepodařilo se upravit vlastní data. {{error}}",
+		"Something went wrong, failed to update data": "Něco je špatně, nepodařilo se upravit vlastní data",
 		"Data updated successfully": "Vlastní data úspěšně aktualizována",
 		"Changes have not been saved. Discard and continue?": "Provedené změny nebyly uloženy. Chcete je zahodit a pokračovat?",
 		"Name": "Název",
@@ -416,13 +416,13 @@
 	"TenantDetailContainer": {
 		"Tenant": "Tenant",
 		"Custom data": "Vlastní data",
-		"Something went wrong, failed to fetch tenant detail": "Něco je špatně, nepodařilo se získat detail tenanta. {{error}}",
+		"Something went wrong, failed to fetch tenant detail": "Něco je špatně, nepodařilo se získat detail tenanta",
 		"Assigned credentials": "Přiřazené uživatelské údaje",
 		"Assign credentials": "Přiřadit uživatelské údaje",
-		"Something went wrong, failed to fetch assigned credentials": "Něco je špatně, nepodařilo se načíst přiřazené uživatelské údaje. {{error}}",
-		"Something went wrong, the credentials cannot be assigned": "Něco je špatně, nepodařilo se přiřadit uživatele. {{error}}",
-		"Something went wrong, the credentials cannot be unassigned": "Něco je špatně, nepodařilo se odebrat uživatele. {{error}}",
-		"Something went wrong, failed to fetch data": "Něco je špatně, nepodařilo se získat data. {{error}}",
+		"Something went wrong, failed to fetch assigned credentials": "Něco je špatně, nepodařilo se načíst přiřazené uživatelské údaje",
+		"Something went wrong, the credentials cannot be assigned": "Něco je špatně, nepodařilo se přiřadit uživatele",
+		"Something went wrong, the credentials cannot be unassigned": "Něco je špatně, nepodařilo se odebrat uživatele",
+		"Something went wrong, failed to fetch data": "Něco je špatně, nepodařilo se získat data",
 		"The selected credential has already been assigned": "Vybraný uživatel byl již přiřazen",
 		"Can't fetch the data, you don't have rights to display it": "Nepodařilo se získat data, nemáte dostatečná oprávnění k jejich zobrazení",
 		"Unable to unassign credentials": "Nepodařilo se odebrat uživatele",
@@ -436,7 +436,7 @@
 		"Unassign credentials": "Odebrat uživatele",
 		"Do you want to remove the tenant?": "Opravdu chcete odstranit tenanta?",
 		"Do you want to unassign these credentials?": "Opravdu chcete odebrat uživatele?",
-		"Failed to remove the tenant": "Nepodařilo se odstranit tenanta. {{error}}",
+		"Failed to remove the tenant": "Nepodařilo se odstranit tenanta",
 		"Tenant removed successfully": "Tenant úspěšně odstraněn",
 		"Tenant data updated successfully": "Tenant úspěšně aktualizován"
 	},
@@ -454,8 +454,8 @@
 		"Tenant name is too short, minimum is 3 characters": "Název tenanta je příliš krátký, nutné jsou alespoň 3 znaky",
 		"Invalid format, only lower-case letters, numbers, dash and underscore are allowed": "Nesprávný formát, pouze malá písmena, číslice, pomlčka a podtržítko jsou povoleny",
 		"Only lower-case letters, numbers, dash and underscore are allowed": "Pouze malá písmena, číslice, pomlčka a podtržítko jsou povoleny",
-		"Something went wrong, failed to create tenant": "Něco je špatně, nepodařilo se vytvořit tenanta. {{error}}",
-		"Something went wrong, can't propose tenant name": "Něco je špatně, není možné navrhnout jméno tenanta. {{error}}"
+		"Something went wrong, failed to create tenant": "Něco je špatně, nepodařilo se vytvořit tenanta",
+		"Something went wrong, can't propose tenant name": "Něco je špatně, není možné navrhnout jméno tenanta"
 	},
 	"UserInterfaceCard": {
 		"User interface": "Uživatelské rozhraní",
diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
index e719137d..79059b5c 100644
--- a/public/locales/en/translation.json
+++ b/public/locales/en/translation.json
@@ -84,16 +84,16 @@
 	},
 	"ClientListContainer": {
 		"Application type": "Application type",
-		"Failed to fetch clients": "Failed to fetch clients. {{error}}",
+		"Failed to fetch clients": "Failed to fetch clients",
 		"Client name": "Client name",
 		"New client": "New client",
 		"Clients": "Clients",
 		"Search": "Search"
 	},
 	"ClientCreateContainer": {
-		"Something went wrong, failed to fetch clients": "Something went wrong, failed to fetch clients. {{error}}",
+		"Something went wrong, failed to fetch clients": "Something went wrong, failed to fetch clients",
 		"Client has been created": "Client has been created",
-		"Something went wrong, client has not been created": "Something went wrong, client has not been created. {{error}}",
+		"Something went wrong, client has not been created": "Something went wrong, client has not been created",
 		"Create new client": "Create new client",
 		"Template": "Template",
 		"Client name": "Client name",
@@ -108,15 +108,15 @@
 		"Unknown item": "Unknown item"
 	},
 	"ClientDetailContainer": {
-		"Something went wrong, failed to fetch client details": "Something went wrong, failed to fetch client details. {{error}}",
+		"Something went wrong, failed to fetch client details": "Something went wrong, failed to fetch client details",
 		"Secret has been reset successfully": "Secret has been reset successfully",
-		"Something went wrong, failed to reset secret": "Something went wrong, failed to reset secret. {{error}}",
+		"Something went wrong, failed to reset secret": "Something went wrong, failed to reset secret",
 		"Do you want to reset this secret?": "Do you want to reset this secret?",
-		"Something went wrong, failed to update client": "Something went wrong, failed to update client. {{error}}",
+		"Something went wrong, failed to update client": "Something went wrong, failed to update client",
 		"Do you want to remove this client?": "Do you want to remove this client?",
 		"Client removed successfully": "Client removed successfully",
 		"Client updated successfully": "Client updated successfully",
-		"Something went wrong, failed to remove client": "Something went wrong, failed to remove client. {{error}}",
+		"Something went wrong, failed to remove client": "Something went wrong, failed to remove client",
 		"Client": "Client",
 		"Client name": "Client name",
 		"Client ID": "Client ID",
@@ -145,13 +145,13 @@
 		"Provider": "Provider",
 		"Create credentials": "Create credentials",
 		"Credentials have been created successfully": "Credentials have been created successfully",
-		"Something went wrong, failed to create credentials": "Something went wrong, failed to create credentials. {{error}}",
-		"Something went wrong, failed to fetch providers": "Something went wrong, failed to fetch providers. {{error}}",
+		"Something went wrong, failed to create credentials": "Something went wrong, failed to create credentials",
+		"Something went wrong, failed to fetch providers": "Something went wrong, failed to fetch providers",
 		"Create": "Create",
 		"Invite": "Invite",
 		"Invite user": "Invite user",
 		"Invitation sent successfully": "Invitation sent successfully",
-		"Something went wrong, failed to send invitation": "Something went wrong, failed to send invitation. {{error}}"
+		"Something went wrong, failed to send invitation": "Something went wrong, failed to send invitation"
 	},
 	"CredentialsDetailContainer": {
 		"Credentials": "Credentials",
@@ -173,19 +173,19 @@
 		"Do you want to remove this user?": "Do you want to remove this user?",
 		"Do you want to suspend this user?": "Do you want to suspend this user?",
 		"Do you want to activate this user?": "Do you want to activate this user?",
-		"Something went wrong, failed to fetch user details": "Something went wrong, failed to fetch user details. {{error}}",
-		"Something went wrong, failed to fetch user sessions": "Something went wrong, failed to fetch user sessions. {{error}}",
-		"Something went wrong, failed to remove user": "Something went wrong, failed to remove user. {{error}}",
+		"Something went wrong, failed to fetch user details": "Something went wrong, failed to fetch user details",
+		"Something went wrong, failed to fetch user sessions": "Something went wrong, failed to fetch user sessions",
+		"Something went wrong, failed to remove user": "Something went wrong, failed to remove user",
 		"User removed successfully": "User removed successfully",
-		"Something went wrong, failed to update user": "Something went wrong, failed to update user. {{error}}",
+		"Something went wrong, failed to update user": "Something went wrong, failed to update user",
 		"User has been updated successfully": "User has been updated successfully",
 		"Phone number already in use": "Phone number already in use",
 		"Email address already in use": "Email address already in use",
-		"Something went wrong, failed to fetch provider data": "Something went wrong, failed to fetch provider data. {{error}}",
+		"Something went wrong, failed to fetch provider data": "Something went wrong, failed to fetch provider data",
 		"Information editing is not allowed within this credentials": "Information editing is not allowed within this credentials",
 		"Invited": "Invited",
 		"Resend invitation": "Resend invitation",
-		"Something went wrong, failed to resend invitation": "Something went wrong, failed to resend invitation. {{error}}",
+		"Something went wrong, failed to resend invitation": "Something went wrong, failed to resend invitation",
 		"Invitation sent successfully": "Invitation sent successfully"
 	},
 	"CredentialsRolesCard": {
@@ -193,18 +193,18 @@
 		"Assign a new role": "Assign a new role",
 		"Select role to assign ...": "Select role to assign ...",
 		"Roles updated successfully": "Roles updated successfully",
-		"Failed to update roles": "Failed to update roles. {{error}}",
-		"Something went wrong, failed to fetch roles": "Something went wrong, failed to fetch roles. {{error}}",
-		"Something went wrong, failed to fetch assigned roles": "Something went wrong, failed to fetch assigned roles. {{error}}"
+		"Failed to update roles": "Failed to update roles",
+		"Something went wrong, failed to fetch roles": "Something went wrong, failed to fetch roles",
+		"Something went wrong, failed to fetch assigned roles": "Something went wrong, failed to fetch assigned roles"
 	},
 	"CredentialsTenantsCard": {
 		"Tenants": "Tenants",
 		"Assign a tenant": "Assign a tenant",
 		"Search": "Search",
 		"Tenants updated successfully": "Tenants updated successfully",
-		"Failed to update tenants": "Failed to update tenants. {{error}}",
-		"Something went wrong, failed to fetch tenants": "Something went wrong, failed to fetch tenants. {{error}}",
-		"Something went wrong, failed to fetch assigned tenants": "Something went wrong, failed to fetch assigned tenants. {{error}}",
+		"Failed to update tenants": "Failed to update tenants",
+		"Something went wrong, failed to fetch tenants": "Something went wrong, failed to fetch tenants",
+		"Something went wrong, failed to fetch assigned tenants": "Something went wrong, failed to fetch assigned tenants",
 		"No match": "No match"
 	},
 	"CredentialsSessionCard": {
@@ -215,7 +215,7 @@
 		"Do you want to terminate user sessions?": "Do you want to terminate user sessions?",
 		"Sessions successfully terminated": "Sessions successfully terminated",
 		"Something went wrong when terminating sessions": "Something went wrong when terminating sessions",
-		"Failed to terminate sessions": "Failed to terminate sessions. {{error}}"
+		"Failed to terminate sessions": "Failed to terminate sessions"
 	},
 	"CredentialsListContainer": {
 		"Credentials": "Credentials",
@@ -227,7 +227,7 @@
 		"Search": "Search",
 		"Tenants": "Tenants",
 		"Roles": "Roles",
-		"Something went wrong, failed to fetch data": "Something went wrong, failed to fetch data. {{error}}",
+		"Something went wrong, failed to fetch data": "Something went wrong, failed to fetch data",
 		"Can't fetch the data, you don't have rights to display it": "Can't fetch the data, you don't have rights to display it",
 		"Credentials invited": "Credentials invited"
 	},
@@ -262,31 +262,31 @@
 		"Username": "Username",
 		"ID": "ID",
 		"Password has been reset": "Password has been reset",
-		"Something went wrong, failed to reset user's password": "Something went wrong, failed to reset user's password. {{error}}",
+		"Something went wrong, failed to reset user's password": "Something went wrong, failed to reset user's password",
 		"Reset password": "Reset password",
 		"Specify password": "Specify password",
 		"New password": "New password",
 		"Password cannot be empty!": "Password cannot be empty!",
 		"Do you want to reset password for this user?": "Do you want to reset password for this user?",
-		"Something went wrong, failed to fetch user details": "Something went wrong, failed to fetch user details. {{error}}"
+		"Something went wrong, failed to fetch user details": "Something went wrong, failed to fetch user details"
 	},
 	"RolesListContainer": {
 		"Roles overview": "Roles overview",
 		"Create role": "Create role",
 		"Role": "Role",
-		"Something went wrong, failed to fetch roles": "Something went wrong, failed to fetch roles. {{error}}"
+		"Something went wrong, failed to fetch roles": "Something went wrong, failed to fetch roles"
 	},
 	"RolesDetailContainer": {
 		"Role removed successfully": "Role removed successfully",
-		"Failed to remove the role": "Failed to remove the role. {{error}}",
+		"Failed to remove the role": "Failed to remove the role",
 		"Role": "Role",
 		"Remove role": "Remove role",
 		"Do you want to remove the role?": "Do you want to remove the role?",
-		"Something went wrong, failed to fetch role detail": "Something went wrong, failed to fetch role detail. {{error}}",
-		"Something went wrong, failed to fetch data": "Something went wrong, failed to fetch data. {{error}}",
+		"Something went wrong, failed to fetch role detail": "Something went wrong, failed to fetch role detail",
+		"Something went wrong, failed to fetch data": "Something went wrong, failed to fetch data",
 		"Can't fetch the data, you don't have rights to display it": "Can't fetch the data, you don't have rights to display it",
-		"Something went wrong, the credentials cannot be assigned": "Something went wrong, the credentials cannot be assigned. {{error}}",
-		"Something went wrong, the credentials cannot be unassigned": "Something went wrong, the credentials cannot be unassigned. {{error}}",
+		"Something went wrong, the credentials cannot be assigned": "Something went wrong, the credentials cannot be assigned",
+		"Something went wrong, the credentials cannot be unassigned": "Something went wrong, the credentials cannot be unassigned",
 		"The selected credential has already been assigned": "The selected credential has already been assigned",
 		"Unable to assign credentials": "Unable to assign credentials",
 		"Unable to unassign credentials": "Unable to unassign credentials",
@@ -297,7 +297,7 @@
 		"Unassign credentials": "Unassign credentials",
 		"Do you want to unassign these credentials?": "Do you want to unassign these credentials?",
 		"Credentials suspended": "Credentials suspended",
-		"Something went wrong, failed to fetch assigned credentials": "Something went wrong, failed to fetch assigned credentials. {{error}}",
+		"Something went wrong, failed to fetch assigned credentials": "Something went wrong, failed to fetch assigned credentials",
 		"Assign credentials": "Assign credentials",
 		"Assigned credentials": "Assigned credentials"
 	},
@@ -313,13 +313,13 @@
 		"Invalid format, only letters, numbers, dash and underscore are allowed": "Invalid format, only letters, numbers, dash and underscore are allowed",
 		"Invalid format": "Invalid format:",
 		"Only letters, numbers, dash and underscore are allowed": "Only letters, numbers, dash and underscore are allowed",
-		"Something went wrong, role has not been created": "Something went wrong, role has not been created. {{error}}"
+		"Something went wrong, role has not been created": "Something went wrong, role has not been created"
 	},
 	"RolesResourcesCard": {
-		"Fetch of all resources failed": "Failed to fetch all resources. {{error}}",
-		"Fetch of assigned resources failed": "Failed to fetch assigned resources. {{error}}",
+		"Fetch of all resources failed": "Failed to fetch all resources",
+		"Fetch of assigned resources failed": "Failed to fetch assigned resources",
 		"Role has been updated successfully": "Role has been updated successfully",
-		"Update of the role has failed": "Update of the role has failed. {{error}}",
+		"Update of the role has failed": "Update of the role has failed",
 		"Assigned resources": "Assigned resources",
 		"Add resource": "Add resource",
 		"Select resource": "Select resource",
@@ -341,44 +341,44 @@
 		"Invalid format, resource cannot start with a underscore": "Invalid format, resource cannot start with a underscore",
 		"Invalid format, only letters, numbers, dash and underscore are allowed": "Invalid format, only letters, numbers, dash and underscore are allowed",
 		"Only lower-case letters, numbers, dash and underscore are allowed": "Only lower-case letters, numbers, dash and underscore are allowed",
-		"Something went wrong, failed to create resource": "Something went wrong, failed to create resource. {{error}}"
+		"Something went wrong, failed to create resource": "Something went wrong, failed to create resource"
 	},
 	"ResourcesDetailContainer": {
 		"Resource": "Resource",
 		"Resource updated successfully": "Resource updated successfully",
-		"Something went wrong, can't fetch resource details": "Something went wrong, can't fetch resource details. {{error}}",
-		"Something went wrong, failed to update resource": "Something went wrong, failed to update resource. {{error}}"
+		"Something went wrong, can't fetch resource details": "Something went wrong, can't fetch resource details",
+		"Something went wrong, failed to update resource": "Something went wrong, failed to update resource"
 	},
 	"ResourcesListContainer": {
 		"Resources list": "Resources list",
 		"Create resource": "Create resource",
-		"Something went wrong, failed to load resources": "Something went wrong, failed to load resources. {{error}}"
+		"Something went wrong, failed to load resources": "Something went wrong, failed to load resources"
 	},
 	"SessionListContainer": {
 		"Credentials": "Credentials",
-		"Failed to fetch the object": "Failed to fetch the object. {{error}}",
+		"Failed to fetch the object": "Failed to fetch the object",
 		"Sessions": "Sessions",
 		"Expected expiration": "Expected expiration",
 		"Terminate session": "Terminate session",
 		"Do you want to terminate this session?": "Do you want to terminate this session?",
 		"Session successfully terminated": "Session successfully terminated",
 		"Something went wrong when terminating session": "Something went wrong when terminating session",
-		"Failed to terminate the session": "Failed to terminate the session. {{error}}",
+		"Failed to terminate the session": "Failed to terminate the session",
 		"Terminate all sessions": "Terminate all sessions",
 		"Terminate all": "Terminate all",
 		"Do you want to terminate all sessions?": "Do you want to terminate all sessions?",
 		"All sessions successfully terminated": "All sessions successfully terminated",
 		"Something went wrong when terminating all sessions": "Something went wrong when terminating all sessions",
-		"Failed to terminate all sessions": "Failed to terminate all sessions. {{error}}",
+		"Failed to terminate all sessions": "Failed to terminate all sessions",
 		"Access denied, you do not have a right to perform this action": "Access denied, you do not have a right to perform this action",
 		"Session": "Session"
 	},
 	"SessionDetailContainer": {
-		"Failed to fetch details": "Failed to fetch details. {{error}}",
+		"Failed to fetch details": "Failed to fetch details",
 		"Do you want to terminate this session?": "Do you want to terminate this session?",
 		"Session successfully terminated": "Session successfully terminated",
 		"Something went wrong when terminating session": "Something went wrong when terminating session",
-		"Failed to terminate the session": "Failed to terminate the session. {{error}}",
+		"Failed to terminate the session": "Failed to terminate the session",
 		"Session": "Session",
 		"Terminate session": "Terminate session",
 		"Session ID": "Session ID",
@@ -391,7 +391,7 @@
 		"Authorization": "Authorization"
 	},
 	"TenantListContainer": {
-		"Failed to fetch tenants": "Failed to fetch tenants. {{error}}",
+		"Failed to fetch tenants": "Failed to fetch tenants",
 		"Tenants": "Tenants",
 		"New tenant": "New tenant"
 	},
@@ -405,7 +405,7 @@
 		"No changes were made": "No changes were made",
 		"Remove input": "Remove input",
 		"Nothing to remove": "Nothing to remove",
-		"Something went wrong, failed to update data": "Something went wrong, failed to update data. {{error}}",
+		"Something went wrong, failed to update data": "Something went wrong, failed to update data",
 		"Data updated successfully": "Data updated successfully",
 		"Changes have not been saved. Discard and continue?": "Changes have not been saved. Discard and continue?",
 		"Name": "Name",
@@ -416,13 +416,13 @@
 	"TenantDetailContainer": {
 		"Tenant": "Tenant",
 		"Custom data": "Custom Data",
-		"Something went wrong, failed to fetch tenant detail": "Something went wrong, failed to fetch tenant detail. {{error}}",
+		"Something went wrong, failed to fetch tenant detail": "Something went wrong, failed to fetch tenant detail",
 		"Assigned credentials": "Assigned credentials",
 		"Assign credentials": "Assign credentials",
-		"Something went wrong, failed to fetch assigned credentials": "Something went wrong, failed to fetch assigned credentials. {{error}}",
-		"Something went wrong, the credentials cannot be assigned": "Something went wrong, the credentials cannot be assigned. {{error}}",
-		"Something went wrong, the credentials cannot be unassigned": "Something went wrong, the credentials cannot be unassigned. {{error}}",
-		"Something went wrong, failed to fetch data": "Something went wrong, failed to fetch data. {{error}}",
+		"Something went wrong, failed to fetch assigned credentials": "Something went wrong, failed to fetch assigned credentials",
+		"Something went wrong, the credentials cannot be assigned": "Something went wrong, the credentials cannot be assigned",
+		"Something went wrong, the credentials cannot be unassigned": "Something went wrong, the credentials cannot be unassigned",
+		"Something went wrong, failed to fetch data": "Something went wrong, failed to fetch data",
 		"The selected credential has already been assigned": "The selected credential has already been assigned",
 		"Can't fetch the data, you don't have rights to display it": "Can't fetch the data, you don't have rights to display it",
 		"Unable to unassign credentials": "Unable to unassign credentials",
@@ -436,7 +436,7 @@
 		"Unassign credentials": "Unassign credentials",
 		"Do you want to remove the tenant?": "Do you want to remove the tenant?",
 		"Do you want to unassign these credentials?": "Do you want to unassign these credentials?",
-		"Failed to remove the tenant": "Failed to remove the tenant. {{error}}",
+		"Failed to remove the tenant": "Failed to remove the tenant",
 		"Tenant removed successfully": "Tenant removed successfully",
 		"Tenant data updated successfully": "Tenant data updated successfully"
 	},
@@ -455,8 +455,8 @@
 		"Invalid format, only lower-case letters, numbers, dash and underscore are allowed": "Invalid format, only lower-case letters, numbers, dash and underscore are allowed",
 		"Invalid format": "Invalid format:",
 		"Only lower-case letters, numbers, dash and underscore are allowed": "Only lower-case letters, numbers, dash and underscore are allowed",
-		"Something went wrong, failed to create tenant": "Something went wrong, failed to create tenant. {{error}}",
-		"Something went wrong, can't propose tenant name": "Something went wrong, can't propose tenant name. {{error}}"
+		"Something went wrong, failed to create tenant": "Something went wrong, failed to create tenant",
+		"Something went wrong, can't propose tenant name": "Something went wrong, can't propose tenant name"
 	},
 	"UserInterfaceCard": {
 		"User interface": "User interface",
diff --git a/src/modules/auth/clients/ClientCreateContainer.js b/src/modules/auth/clients/ClientCreateContainer.js
index da1db602..ae026a32 100644
--- a/src/modules/auth/clients/ClientCreateContainer.js
+++ b/src/modules/auth/clients/ClientCreateContainer.js
@@ -85,7 +85,7 @@ const ClientCreateContainer = (props) => {
 			setTemplate(response.data["templates"]);
 		} catch (e) {
 			console.error("Failed to retrieve providers from server: ", e);
-			props.app.addAlert("warning", t("ClientCreateContainer|Something went wrong, failed to fetch clients", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("ClientCreateContainer|Something went wrong, failed to fetch clients")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
@@ -124,7 +124,7 @@ const ClientCreateContainer = (props) => {
 
 		} catch (e) {
 			console.error(e);
-			props.app.addAlert("warning", t("ClientCreateContainer|Something went wrong, client has not been created", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("ClientCreateContainer|Something went wrong, client has not been created")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
diff --git a/src/modules/auth/clients/ClientDetailContainer.js b/src/modules/auth/clients/ClientDetailContainer.js
index c5961ad7..d5d70031 100644
--- a/src/modules/auth/clients/ClientDetailContainer.js
+++ b/src/modules/auth/clients/ClientDetailContainer.js
@@ -64,7 +64,7 @@ const ClientDetailContainer = (props) =>  {
 			setClient(response.data);
 		} catch (e) {
 			console.error(e);
-			props.app.addAlert("warning", t("ClientDetailContainer|Something went wrong, failed to fetch client details", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("ClientDetailContainer|Something went wrong, failed to fetch client details")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
@@ -78,7 +78,7 @@ const ClientDetailContainer = (props) =>  {
 			getClientDetail();
 		} catch (e) {
 			console.error(e);
-			props.app.addAlert("warning", t('ClientDetailContainer|Something went wrong, failed to reset secret', {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("ClientDetailContainer|Something went wrong, failed to reset secret")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
@@ -128,7 +128,7 @@ const ClientDetailContainer = (props) =>  {
 			setDisabled(false);
 			setEditMode(true);
 			console.error(e);
-			props.app.addAlert("warning", t("ClientDetailContainer|Something went wrong, failed to update client", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("ClientDetailContainer|Something went wrong, failed to update client")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
@@ -152,7 +152,7 @@ const ClientDetailContainer = (props) =>  {
 			props.history.push("/auth/clients"); // Redirect to the Client list page
 		} catch(e) {
 			console.error(e); // log the error to the browser's console
-			props.app.addAlert("warning", t('ClientDetailContainer|Something went wrong, failed to remove client', {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("ClientDetailContainer|Something went wrong, failed to remove client")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
diff --git a/src/modules/auth/clients/ClientListContainer.js b/src/modules/auth/clients/ClientListContainer.js
index 37868c08..bdfb9c95 100644
--- a/src/modules/auth/clients/ClientListContainer.js
+++ b/src/modules/auth/clients/ClientListContainer.js
@@ -86,7 +86,7 @@ function ClientListContainer(props) {
 		} catch (e) {
 			console.error(e);
 			setLoading(false);
-			props.app.addAlert("warning", t("ClientListContainer|Failed to fetch clients", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("ClientListContainer|Failed to fetch clients")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
diff --git a/src/modules/auth/components/CustomDataContainer.js b/src/modules/auth/components/CustomDataContainer.js
index fc4df310..53ae4a39 100644
--- a/src/modules/auth/components/CustomDataContainer.js
+++ b/src/modules/auth/components/CustomDataContainer.js
@@ -83,7 +83,7 @@ export function CustomDataContainer({app, resources, customData, setCustomData,
 			setEdit(false);
 			app.addAlert("success", t("CustomDataContainer|Data updated successfully"));
 		} catch (e) {
-			app.addAlert("warning", t("CustomDataContainer|Something went wrong, failed to update data", {error: e?.response?.data?.message}), 30);
+			app.addAlert("warning", `${t("CustomDataContainer|Something went wrong, failed to update data")}. ${e?.response?.data?.message}`, 30);
 			console.error(e);
 		}
 	}
diff --git a/src/modules/auth/credentials/CredentialsCreateContainer.js b/src/modules/auth/credentials/CredentialsCreateContainer.js
index fac259af..e7c3e93e 100644
--- a/src/modules/auth/credentials/CredentialsCreateContainer.js
+++ b/src/modules/auth/credentials/CredentialsCreateContainer.js
@@ -74,7 +74,7 @@ function CredentialsCreateContainer(props) {
 			setProviders(reg_conf);
 		} catch (e) {
 			console.error("Failed to retrieve providers from server: ", e);
-			props.app.addAlert("warning", t("CredentialsCreateContainer|Something went wrong, failed to fetch providers", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("CredentialsCreateContainer|Something went wrong, failed to fetch providers")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
@@ -124,7 +124,7 @@ function CredentialsCreateContainer(props) {
 			props.history.push("/auth/credentials/" + response.data._id);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsCreateContainer|Something went wrong, failed to create credentials", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("CredentialsCreateContainer|Something went wrong, failed to create credentials")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
@@ -160,7 +160,7 @@ function CredentialsCreateContainer(props) {
 			props.history.push(`/auth/credentials/${response.data.credentials_id}`);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsCreateContainer|Something went wrong, failed to send invitation", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("CredentialsCreateContainer|Something went wrong, failed to send invitation")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
diff --git a/src/modules/auth/credentials/CredentialsDetailContainer.js b/src/modules/auth/credentials/CredentialsDetailContainer.js
index 2dd80f13..5b669ccd 100644
--- a/src/modules/auth/credentials/CredentialsDetailContainer.js
+++ b/src/modules/auth/credentials/CredentialsDetailContainer.js
@@ -69,7 +69,7 @@ function CredentialsDetailContainer(props) {
 			setLoadingCustomData(false);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsDetailContainer|Something went wrong, failed to fetch user details", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("CredentialsDetailContainer|Something went wrong, failed to fetch user details")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
@@ -85,7 +85,7 @@ function CredentialsDetailContainer(props) {
 			}
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsDetailContainer|Something went wrong, failed to fetch provider data", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("CredentialsDetailContainer|Something went wrong, failed to fetch provider data")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
@@ -97,7 +97,7 @@ function CredentialsDetailContainer(props) {
 			setSessions(response.data.data);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("SessionListContainer|Something went wrong, failed to fetch user sessions", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("SessionListContainer|Something went wrong, failed to fetch user sessions")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
@@ -119,7 +119,7 @@ function CredentialsDetailContainer(props) {
 			props.history.push("/auth/credentials");
 		} catch(e) {
 			console.error(e); // log the error to the browser's console
-			props.app.addAlert("warning", t('CredentialsDetailContainer|Something went wrong, failed to remove user', {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("CredentialsDetailContainer|Something went wrong, failed to remove user")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
@@ -158,7 +158,7 @@ function CredentialsDetailContainer(props) {
 			retrieveData();
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t('CredentialsDetailContainer|Something went wrong, failed to update user', {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("CredentialsDetailContainer|Something went wrong, failed to update user")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
@@ -181,7 +181,7 @@ function CredentialsDetailContainer(props) {
 			props.app.addAlert("success", t('CredentialsDetailContainer|Invitation sent successfully'));
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t('CredentialsDetailContainer|Something went wrong, failed to resend invitation', {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("CredentialsDetailContainer|Something went wrong, failed to resend invitation")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
@@ -453,7 +453,7 @@ function CredentialsInfoCard(props) {
 				}
 			}
 			console.error(e);
-			props.app.addAlert("warning", t('CredentialsDetailContainer|Something went wrong, failed to update user', {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("CredentialsDetailContainer|Something went wrong, failed to update user")}. ${e?.response?.data?.message}`, 30);
 			return;
 		}
 	}
diff --git a/src/modules/auth/credentials/CredentialsListContainer.js b/src/modules/auth/credentials/CredentialsListContainer.js
index 6c04b115..1b2a9c67 100644
--- a/src/modules/auth/credentials/CredentialsListContainer.js
+++ b/src/modules/auth/credentials/CredentialsListContainer.js
@@ -163,7 +163,7 @@ function CredentialsListContainer(props) {
 				props.app.addAlert("warning", t("CredentialsListContainer|Can't fetch the data, you don't have rights to display it"), 30);
 				return;
 			}
-			props.app.addAlert("warning", t("CredentialsListContainer|Something went wrong, failed to fetch data", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("CredentialsListContainer|Something went wrong, failed to fetch data")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
@@ -179,7 +179,7 @@ function CredentialsListContainer(props) {
 
 		} catch (e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsListContainer|Something went wrong, failed to fetch data", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("CredentialsListContainer|Something went wrong, failed to fetch data")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
@@ -195,7 +195,7 @@ function CredentialsListContainer(props) {
 
 		} catch (e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsListContainer|Something went wrong, failed to fetch data", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("CredentialsListContainer|Something went wrong, failed to fetch data")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
diff --git a/src/modules/auth/credentials/CredentialsRolesCard.js b/src/modules/auth/credentials/CredentialsRolesCard.js
index 6ff60be9..3b19b2d5 100644
--- a/src/modules/auth/credentials/CredentialsRolesCard.js
+++ b/src/modules/auth/credentials/CredentialsRolesCard.js
@@ -43,7 +43,7 @@ function CredentialsRolesCard(props) {
 			setPrevAssignedRoles(response.data);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsRolesCard|Something went wrong, failed to fetch assigned roles", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("CredentialsRolesCard|Something went wrong, failed to fetch assigned roles")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
@@ -57,7 +57,7 @@ function CredentialsRolesCard(props) {
 			setRolesLookup(roles);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsRolesCard|Something went wrong, failed to fetch roles", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("CredentialsRolesCard|Something went wrong, failed to fetch roles")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
@@ -86,7 +86,7 @@ function CredentialsRolesCard(props) {
 			setEditMode(false);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsRolesCard|Failed to update roles", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("CredentialsRolesCard|Failed to update roles")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
diff --git a/src/modules/auth/credentials/CredentialsSessionCard.js b/src/modules/auth/credentials/CredentialsSessionCard.js
index d7d4d2b7..94a90db9 100644
--- a/src/modules/auth/credentials/CredentialsSessionCard.js
+++ b/src/modules/auth/credentials/CredentialsSessionCard.js
@@ -33,7 +33,7 @@ function CredentialsSessionCard(props) {
 			props.retrieveSessions();
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsSessionCard|Failed to terminate sessions", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("CredentialsSessionCard|Failed to terminate sessions")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
diff --git a/src/modules/auth/credentials/CredentialsTenantsCard.js b/src/modules/auth/credentials/CredentialsTenantsCard.js
index c08052f5..008470bf 100644
--- a/src/modules/auth/credentials/CredentialsTenantsCard.js
+++ b/src/modules/auth/credentials/CredentialsTenantsCard.js
@@ -60,7 +60,7 @@ function CredentialsTenantsCard(props) {
 			setPrevAssignedTenants(response.data)
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsTenantsCard|Something went wrong, failed to fetch assigned tenants", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("CredentialsTenantsCard|Something went wrong, failed to fetch assigned tenants")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
@@ -92,7 +92,7 @@ function CredentialsTenantsCard(props) {
 			setAllTenants(eligibleTenants);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsTenantsCard|Something went wrong, failed to fetch tenants", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("CredentialsTenantsCard|Something went wrong, failed to fetch tenants")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
@@ -106,7 +106,7 @@ function CredentialsTenantsCard(props) {
 			props.setRolesRefresh(prev => !prev);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("CredentialsRolesCard|Failed to update tenants", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("CredentialsRolesCard|Failed to update tenants")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
diff --git a/src/modules/auth/credentials/ResetPasswordContainer.js b/src/modules/auth/credentials/ResetPasswordContainer.js
index 90550815..855c69d2 100644
--- a/src/modules/auth/credentials/ResetPasswordContainer.js
+++ b/src/modules/auth/credentials/ResetPasswordContainer.js
@@ -38,7 +38,7 @@ function ResetPasswordContainer(props) {
 			setData(response.data);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("ResetPasswordContainer|Something went wrong, failed to fetch user details", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("ResetPasswordContainer|Something went wrong, failed to fetch user details")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
@@ -67,7 +67,7 @@ function ResetPasswordContainer(props) {
 			props.history.push(`/auth/credentials/${credentials_id}`)
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("ResetPasswordContainer|Something went wrong, failed to reset user's password", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("ResetPasswordContainer|Something went wrong, failed to reset user's password")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
diff --git a/src/modules/auth/resources/ResourcesCreateContainer.js b/src/modules/auth/resources/ResourcesCreateContainer.js
index b66077d5..3521790f 100644
--- a/src/modules/auth/resources/ResourcesCreateContainer.js
+++ b/src/modules/auth/resources/ResourcesCreateContainer.js
@@ -46,7 +46,7 @@ const ResourceCreateContainer = (props) => {
 			props.history.push("/auth/resources");
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("ResourcesCreateContainer|Something went wrong, failed to create resource", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("ResourcesCreateContainer|Something went wrong, failed to create resource")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
diff --git a/src/modules/auth/resources/ResourcesDetailContainer.js b/src/modules/auth/resources/ResourcesDetailContainer.js
index 41262ba9..ab625e2b 100644
--- a/src/modules/auth/resources/ResourcesDetailContainer.js
+++ b/src/modules/auth/resources/ResourcesDetailContainer.js
@@ -32,7 +32,7 @@ const ResourceDetailContainer = (props) =>  {
 			setResource(response.data);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("ResourcesDetailContainer|Something went wrong, can't fetch resource details", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("ResourcesDetailContainer|Something went wrong, can't fetch resource details")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
@@ -60,7 +60,7 @@ const ResourceDetailContainer = (props) =>  {
 			getResourceDetail();
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("ResourcesDetailContainer|Something went wrong, failed to update resource", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("ResourcesDetailContainer|Something went wrong, failed to update resource")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
diff --git a/src/modules/auth/resources/ResourcesListContainer.js b/src/modules/auth/resources/ResourcesListContainer.js
index d1058efa..ceee280f 100644
--- a/src/modules/auth/resources/ResourcesListContainer.js
+++ b/src/modules/auth/resources/ResourcesListContainer.js
@@ -65,7 +65,7 @@ function ResourcesListContainer(props) {
 		} catch(e) {
 			console.error(e);
 			setLoading(false);
-			props.app.addAlert("warning", t("ResourcesListContainer|Something went wrong, failed to load resources", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("ResourcesListContainer|Something went wrong, failed to load resources")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
diff --git a/src/modules/auth/roles/RolesCreateContainer.js b/src/modules/auth/roles/RolesCreateContainer.js
index 05149b39..c63f8dfe 100644
--- a/src/modules/auth/roles/RolesCreateContainer.js
+++ b/src/modules/auth/roles/RolesCreateContainer.js
@@ -39,7 +39,7 @@ const RolesCreateContainer = (props) => {
 			props.history.push(`/auth/roles/${tenant}/${values.roleName}`);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("RolesCreateContainer|Something went wrong, role has not been created", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("RolesCreateContainer|Something went wrong, role has not been created")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
diff --git a/src/modules/auth/roles/RolesDetailContainer.js b/src/modules/auth/roles/RolesDetailContainer.js
index 565fe2de..353061bb 100644
--- a/src/modules/auth/roles/RolesDetailContainer.js
+++ b/src/modules/auth/roles/RolesDetailContainer.js
@@ -124,7 +124,7 @@ const RolesDetailContainer = (props) =>  {
 			setRole(response.data);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("RolesDetailContainer|Something went wrong, failed to fetch role detail", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("RolesDetailContainer|Something went wrong, failed to fetch role detail")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
@@ -135,7 +135,7 @@ const RolesDetailContainer = (props) =>  {
 			props.history.push("/auth/roles");
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("RolesDetailContainer|Failed to remove the role", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("RolesDetailContainer|Failed to remove the role")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
@@ -161,7 +161,7 @@ const RolesDetailContainer = (props) =>  {
 		} catch(e) {
 			console.error(e);
 			setLoading(false);
-			props.app.addAlert("warning", t("RolesDetailContainer|Something went wrong, failed to fetch assigned credentials", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("RolesDetailContainer|Something went wrong, failed to fetch assigned credentials")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
@@ -182,7 +182,7 @@ const RolesDetailContainer = (props) =>  {
 				props.app.addAlert("warning", t("RolesDetailContainer|Can't fetch the data, you don't have rights to display it"), 30);
 				return;
 			}
-			props.app.addAlert("warning", t("RolesDetailContainer|Something went wrong, failed to fetch data", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("RolesDetailContainer|Something went wrong, failed to fetch data")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
@@ -200,7 +200,7 @@ const RolesDetailContainer = (props) =>  {
 				props.app.addAlert("warning", t("RolesDetailContainer|The selected credential has already been assigned"), 30);
 			} else {
 				console.error(e);
-				props.app.addAlert("warning", t("RolesDetailContainer|Something went wrong, the credentials cannot be assigned", {error: e?.response?.data?.message}), 30);
+				props.app.addAlert("warning", `${t("RolesDetailContainer|Something went wrong, the credentials cannot be assigned")}. ${e?.response?.data?.message}`, 30);
 			}
 		}
 	};
@@ -217,7 +217,7 @@ const RolesDetailContainer = (props) =>  {
 
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("RolesDetailContainer|Something went wrong, the credentials cannot be unassigned", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("RolesDetailContainer|Something went wrong, the credentials cannot be unassigned")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
diff --git a/src/modules/auth/roles/RolesListContainer.js b/src/modules/auth/roles/RolesListContainer.js
index dfb35c78..da269904 100644
--- a/src/modules/auth/roles/RolesListContainer.js
+++ b/src/modules/auth/roles/RolesListContainer.js
@@ -82,7 +82,7 @@ const RolesListcontainer = (props) => {
 		} catch(e) {
 			console.error(e);
 			setLoading(false);
-			props.app.addAlert("warning", t("RolesListContainer|Something went wrong, failed to fetch roles", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("RolesListContainer|Something went wrong, failed to fetch roles")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
diff --git a/src/modules/auth/roles/RolesResourcesCard.js b/src/modules/auth/roles/RolesResourcesCard.js
index 8fe2136c..8150bcec 100644
--- a/src/modules/auth/roles/RolesResourcesCard.js
+++ b/src/modules/auth/roles/RolesResourcesCard.js
@@ -31,7 +31,7 @@ const RolesResourcesCard = (props) => {
 				const assignedResources = res.data.resources;
 				setAssignedResources(assignedResources);
 			})
-			.catch((e) => props.app.addAlert("warning", t("RolesResourcesCard|Fetch of assigned resources failed", {error: e?.response?.data?.message}), 30));
+			.catch((e) => props.app.addAlert("warning", `${t("RolesResourcesCard|Fetch of assigned resources failed")}. ${e?.response?.data?.message}`, 30));
 		if (editMode) setEditMode(false);
 	}
 
@@ -46,7 +46,7 @@ const RolesResourcesCard = (props) => {
 				}
 				setUnassignedResources(unassignedResources);
 			})
-			.catch((e) => props.app.addAlert("warning", t("RolesResourcesCard|Fetch of all resources failed", {error: e?.response?.data?.message}), 30));
+			.catch((e) => props.app.addAlert("warning", `${t("RolesResourcesCard|Fetch of all resources failed")}. ${e?.response?.data?.message}`, 30));
 	}
 
 	const assignResource = (resource) => {
@@ -66,7 +66,7 @@ const RolesResourcesCard = (props) => {
 			setEditMode(false);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("RolesResourcesCard|Update of the role has failed", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("RolesResourcesCard|Update of the role has failed")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
diff --git a/src/modules/auth/session/SessionDetailContainer.js b/src/modules/auth/session/SessionDetailContainer.js
index f319e23b..8353e063 100644
--- a/src/modules/auth/session/SessionDetailContainer.js
+++ b/src/modules/auth/session/SessionDetailContainer.js
@@ -77,7 +77,7 @@ function SessionDetailContainer(props) {
 			setData(response.data);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("SessionDetailContainer|Failed to fetch details", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("SessionDetailContainer|Failed to fetch details")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
@@ -100,7 +100,7 @@ function SessionDetailContainer(props) {
 			history.goBack();
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("SessionDetailContainer|Failed to terminate the session", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("SessionDetailContainer|Failed to terminate the session")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
diff --git a/src/modules/auth/session/SessionListContainer.js b/src/modules/auth/session/SessionListContainer.js
index e284b367..41057e60 100644
--- a/src/modules/auth/session/SessionListContainer.js
+++ b/src/modules/auth/session/SessionListContainer.js
@@ -98,7 +98,7 @@ const SessionListContainer = (props) => {
 				props.app.addAlert("warning", t("SessionListContainer|Access denied, you do not have a right to perform this action"), 30);
 			} else {
 				console.error(e);
-				props.app.addAlert("warning", t("SessionListContainer|Failed to fetch the object", {error: e?.response?.data?.message}), 30);
+				props.app.addAlert("warning", `${t("SessionListContainer|Failed to fetch the object")}. ${e?.response?.data?.message}`, 30);
 			}
 			setLoading(false);
 		}
@@ -131,7 +131,7 @@ const SessionListContainer = (props) => {
 			retrieveData();
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("SessionListContainer|Failed to terminate the session", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("SessionListContainer|Failed to terminate the session")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
@@ -149,7 +149,7 @@ const SessionListContainer = (props) => {
 			}, 5000)
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("SessionListContainer|Failed to terminate all sessions", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("SessionListContainer|Failed to terminate all sessions")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
diff --git a/src/modules/auth/tenant/TenantCreateContainer.js b/src/modules/auth/tenant/TenantCreateContainer.js
index e8f2f15c..139f5e59 100644
--- a/src/modules/auth/tenant/TenantCreateContainer.js
+++ b/src/modules/auth/tenant/TenantCreateContainer.js
@@ -41,7 +41,7 @@ function TenantCreateContainer(props) {
 			props.history.push("/auth/tenant");
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("TenantCreateContainer|Something went wrong, failed to create tenant", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("TenantCreateContainer|Something went wrong, failed to create tenant")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
@@ -51,7 +51,7 @@ function TenantCreateContainer(props) {
 			setValue('id', response.data.tenant_id);
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("TenantCreateContainer|Something went wrong, can't propose tenant name", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("TenantCreateContainer|Something went wrong, can't propose tenant name")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
diff --git a/src/modules/auth/tenant/TenantDetailContainer.js b/src/modules/auth/tenant/TenantDetailContainer.js
index 3d939f58..22040386 100644
--- a/src/modules/auth/tenant/TenantDetailContainer.js
+++ b/src/modules/auth/tenant/TenantDetailContainer.js
@@ -136,7 +136,7 @@ function TenantDetailContainer(props) {
 		} catch (e) {
 			console.error(e);
 			setLoadingCustomData(false);
-			props.app.addAlert("warning", t("TenantDetailContainer|Something went wrong, failed to fetch tenant detail", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("TenantDetailContainer|Something went wrong, failed to fetch tenant detail")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
@@ -149,7 +149,7 @@ function TenantDetailContainer(props) {
 			setUsername(response.data.data[data.created_by]);
 		} catch (e) {
 			console.error(e);
-			props.app.addAlert("warning", t("TenantDetailContainer|Something went wrong, failed to fetch assigned credentials", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("TenantDetailContainer|Something went wrong, failed to fetch assigned credentials")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
@@ -170,7 +170,7 @@ function TenantDetailContainer(props) {
 		} catch (e) {
 			console.error(e);
 			setLoading(false);
-			props.app.addAlert("warning", t("TenantDetailContainer|Something went wrong, failed to fetch assigned credentials", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("TenantDetailContainer|Something went wrong, failed to fetch assigned credentials")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
@@ -184,7 +184,7 @@ function TenantDetailContainer(props) {
 			props.history.push("/auth/tenant");
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("TenantDetailContainer|Failed to remove the tenant", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("TenantDetailContainer|Failed to remove the tenant")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 
@@ -205,7 +205,7 @@ function TenantDetailContainer(props) {
 				props.app.addAlert("warning", t("TenantDetailContainer|Can't fetch the data, you don't have rights to display it"), 30);
 				return;
 			}
-			props.app.addAlert("warning", t("TenantDetailContainer|Something went wrong, failed to fetch data", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("TenantDetailContainer|Something went wrong, failed to fetch data")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
@@ -225,7 +225,7 @@ function TenantDetailContainer(props) {
 				props.app.addAlert("warning", t("TenantDetailContainer|The selected credential has already been assigned"), 30);
 			} else {
 				console.error(e);
-				props.app.addAlert("warning", t("TenantDetailContainer|Something went wrong, the credentials cannot be assigned", {error: e?.response?.data?.message}), 30);
+				props.app.addAlert("warning", `${t("TenantDetailContainer|Something went wrong, the credentials cannot be assigned")}. ${e?.response?.data?.message}`, 30);
 			}
 		}
 	};
@@ -242,7 +242,7 @@ function TenantDetailContainer(props) {
 
 		} catch(e) {
 			console.error(e);
-			props.app.addAlert("warning", t("TenantDetailContainer|Something went wrong, the credentials cannot be unassigned", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("TenantDetailContainer|Something went wrong, the credentials cannot be unassigned")}. ${e?.response?.data?.message}`, 30);
 		}
 	};
 
diff --git a/src/modules/auth/tenant/TenantListContainer.js b/src/modules/auth/tenant/TenantListContainer.js
index 523c6c31..9650dcf0 100644
--- a/src/modules/auth/tenant/TenantListContainer.js
+++ b/src/modules/auth/tenant/TenantListContainer.js
@@ -62,7 +62,7 @@ function TenantListContainer(props) {
 		} catch(e) {
 			console.error(e);
 			setLoading(false);
-			props.app.addAlert("warning", t("TenantListContainer|Failed to fetch tenants", {error: e?.response?.data?.message}), 30);
+			props.app.addAlert("warning", `${t("TenantListContainer|Failed to fetch tenants")}. ${e?.response?.data?.message}`, 30);
 		}
 	}
 

From 9d66ffd63316a2b9d483302c919b764976d9977d Mon Sep 17 00:00:00 2001
From: Pe5h4 <pesekf@email.cz>
Date: Wed, 25 Jan 2023 09:44:30 +0100
Subject: [PATCH 17/19] Version bump

---
 asab-webui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/asab-webui b/asab-webui
index 0b97139d..25d5a5ce 160000
--- a/asab-webui
+++ b/asab-webui
@@ -1 +1 @@
-Subproject commit 0b97139df1c2dc0e4e82dd97fd5593334efc5d38
+Subproject commit 25d5a5ce97c6f2286525127cc3a31531b03312f3

From 551b4ade3430eefe0a972cc7a33929aa910de506 Mon Sep 17 00:00:00 2001
From: Pe5h4 <pesekf@email.cz>
Date: Wed, 25 Jan 2023 09:44:39 +0100
Subject: [PATCH 18/19] Update changelog

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a104b6df..ab26f225 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,11 @@
 
 ## Release Candidate
 
+## v23.4
+
 ### Features
 
-- ASAB WebUI submodule version bump [[0b97139](https://github.com/TeskaLabs/asab-webui/commit/0b97139df1c2dc0e4e82dd97fd5593334efc5d38)] commit (INDIGO Sprint 230106, [!13](https://github.com/TeskaLabs/seacat-admin-webui/pull/13))
+- ASAB WebUI submodule version bump [[25d5a5c](https://github.com/TeskaLabs/asab-webui/commit/25d5a5ce97c6f2286525127cc3a31531b03312f3)] commit (INDIGO Sprint 230106, [!8](https://github.com/TeskaLabs/seacat-admin-webui/pull/8))
 
 - Create invitation components (INDIGO Sprint 230106, [!8](https://github.com/TeskaLabs/seacat-admin-webui/pull/8))
 

From aca217afe127ec3a78181fbe42af74c8baef5a36 Mon Sep 17 00:00:00 2001
From: Pe5h4 <pesekf@email.cz>
Date: Wed, 25 Jan 2023 09:50:24 +0100
Subject: [PATCH 19/19] Add compatibility note

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab26f225..6cafae2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@
 
 ## v23.4
 
+### Compatibility
+
+- [x] **SeaCat Auth UI `v23.4` or newer**
+- [x] **SeaCat Auth `v23.3` or newer**
+
+⚠️ Due to implementation of new features, invitation will not work with SeaCat Auth service versions older than `v23.3`
+
 ### Features
 
 - ASAB WebUI submodule version bump [[25d5a5c](https://github.com/TeskaLabs/asab-webui/commit/25d5a5ce97c6f2286525127cc3a31531b03312f3)] commit (INDIGO Sprint 230106, [!8](https://github.com/TeskaLabs/seacat-admin-webui/pull/8))