diff --git a/src/components/SaveButton.tsx b/src/components/SaveButton.tsx
index a83ad89..0323ffe 100644
--- a/src/components/SaveButton.tsx
+++ b/src/components/SaveButton.tsx
@@ -20,16 +20,30 @@ export default function SaveButton() {
         className="saveButton"
         onClick={() => {
           let stateOk = true;
-          Object.keys(data.oidcRPMetaDataOptions).forEach((app) => {
-            if (!ruleOIDC(data.oidcRPMetaDataOptions[app])) {
-              stateOk = false;
-            }
-          });
-          Object.keys(data.samlSPMetaDataXML).forEach((app) => {
-            if (!ruleSAML(data.samlSPMetaDataXML[app])) {
-              stateOk = false;
-            }
-          });
+          if (data.oidcRPMetaDataOptions) {
+            Object.keys(data.oidcRPMetaDataOptions).forEach((app) => {
+              if (
+                !ruleOIDC(
+                  data.oidcRPMetaDataOptions
+                    ? data.oidcRPMetaDataOptions[app]
+                    : {}
+                )
+              ) {
+                stateOk = false;
+              }
+            });
+          }
+          if (data.samlSPMetaDataXML) {
+            Object.keys(data.samlSPMetaDataXML).forEach((app) => {
+              if (
+                !ruleSAML(
+                  data.samlSPMetaDataXML ? data.samlSPMetaDataXML[app] : {}
+                )
+              ) {
+                stateOk = false;
+              }
+            });
+          }
           if (stateOk) {
             dispatch(saveConfigCall());
             setOpenSavingPopup(true);
diff --git a/src/components/applicationsComponents/CasApp.tsx b/src/components/applicationsComponents/CasApp.tsx
index 4361408..6442430 100644
--- a/src/components/applicationsComponents/CasApp.tsx
+++ b/src/components/applicationsComponents/CasApp.tsx
@@ -83,6 +83,7 @@ export function CasApp({ name }: { name: string }) {
                 name,
                 vars,
                 "exportedVars",
+                dispatch,
                 delCASexportedVars,
                 updateCASexportedVars
               )}
@@ -118,6 +119,7 @@ export function CasApp({ name }: { name: string }) {
                 name,
                 casAppMetaDataMacros,
                 "macros",
+                dispatch,
                 delCASAppMetaDataMacros,
                 updateCASAppMetaDataMacros
               )}
diff --git a/src/components/applicationsComponents/NativeApp.tsx b/src/components/applicationsComponents/NativeApp.tsx
index 15490aa..089df15 100644
--- a/src/components/applicationsComponents/NativeApp.tsx
+++ b/src/components/applicationsComponents/NativeApp.tsx
@@ -375,20 +375,27 @@ function NativPost(
 }
 
 export function NativeApp({ name }: { name: string }) {
-  const locationRules = useAppSelector(
-    (state) => state.config.data.config.locationRules[name]
-  );
+  const locationR = useAppSelector((state) => {
+    if (state.config.data.config.locationRules) {
+      return state.config.data.config.locationRules[name];
+    }
+  });
+  const locationRules = locationR ? locationR : {};
   const exportedHeaders = useAppSelector((state) => {
-    return state.config.data.config.exportedHeaders
-      ? state.config.data.config.exportedHeaders[name]
-      : {};
+    if (state.config.data.config.exportedHeaders) {
+      return state.config.data.config.exportedHeaders[name];
+    }
+  });
+  const post = useAppSelector((state) => {
+    if (state.config.data.config.post) {
+      return state.config.data.config.post[name];
+    }
+  });
+  const options = useAppSelector((state) => {
+    if (state.config.data.config.vhostOptions) {
+      return state.config.data.config.vhostOptions[name];
+    }
   });
-  const post = useAppSelector((state) =>
-    state.config.data.config.post ? state.config.data.config.post[name] : {}
-  );
-  const options = useAppSelector(
-    (state) => state.config.data.config.vhostOptions[name]
-  );
   const [optionSelected, setOptionSelected] = useState("basic");
   const dispatch = useAppDispatch();
   return (
@@ -474,7 +481,7 @@ export function NativeApp({ name }: { name: string }) {
                     <FormControl>
                       <RadioGroup
                         row
-                        value={options.vhostMaintenance}
+                        value={options ? options.vhostMaintenance : false}
                         onChange={(e) => {
                           dispatch(
                             updateVhostOptions({
@@ -553,8 +560,9 @@ export function NativeApp({ name }: { name: string }) {
               </thead>
               {TableVars(
                 name,
-                exportedHeaders,
+                exportedHeaders ? exportedHeaders : {},
                 "exportedHeaders",
+                dispatch,
                 delVhostHeader,
                 updateVhostHeaders
               )}
@@ -589,7 +597,7 @@ export function NativeApp({ name }: { name: string }) {
                   </th>
                 </tr>
               </thead>
-              {NativPost(name, post)}
+              {NativPost(name, post ? post : {})}
             </table>
             <Button
               className="plus"
@@ -614,7 +622,11 @@ export function NativeApp({ name }: { name: string }) {
                       variant="filled"
                       className="form"
                       type="number"
-                      value={String(options.vhostPort)}
+                      value={String(
+                        options
+                          ? options.vhostPort
+                          : attributes.vhostPort.default
+                      )}
                       onChange={(el) => {
                         dispatch(
                           updateVhostOptions({
@@ -633,7 +645,11 @@ export function NativeApp({ name }: { name: string }) {
                     <FormControl>
                       <RadioGroup
                         row
-                        value={options.vhostHttps}
+                        value={
+                          options
+                            ? options.vhostHttps
+                            : attributes.vhostHttps.default
+                        }
                         onChange={(e) => {
                           dispatch(
                             updateVhostOptions({
@@ -669,7 +685,7 @@ export function NativeApp({ name }: { name: string }) {
                     <FormControl>
                       <RadioGroup
                         row
-                        value={options.vhostMaintenance}
+                        value={options ? options.vhostMaintenance : false}
                         onChange={(e) => {
                           dispatch(
                             updateVhostOptions({
@@ -704,7 +720,9 @@ export function NativeApp({ name }: { name: string }) {
                       className="form"
                       type="text"
                       value={String(
-                        options.vhostAliases ? options.vhostAliases : ""
+                        options
+                          ? options.vhostAliases
+                          : attributes.vhostAliases.default
                       )}
                       onChange={(el) => {
                         dispatch(
@@ -728,9 +746,9 @@ export function NativeApp({ name }: { name: string }) {
                       className="form"
                       type="text"
                       value={String(
-                        options.vhostAccessToTrace
+                        options
                           ? options.vhostAccessToTrace
-                          : ""
+                          : attributes.vhostAccessToTrace.default
                       )}
                       onChange={(el) => {
                         dispatch(
@@ -750,7 +768,11 @@ export function NativeApp({ name }: { name: string }) {
                     <FormControl sx={{ m: 1, minWidth: 120 }}>
                       <InputLabel>{t("vhostType")}</InputLabel>
                       <Select
-                        value={options.vhostType}
+                        value={
+                          options
+                            ? options.vhostType
+                            : attributes.vhostType.default
+                        }
                         label={t("vhostType")}
                         onChange={(el) =>
                           dispatch(
@@ -782,7 +804,7 @@ export function NativeApp({ name }: { name: string }) {
                       variant="filled"
                       className="form"
                       type="number"
-                      value={String(options.vhostAuthnLevel)}
+                      value={String(options ? options.vhostAuthnLevel : 0)}
                       onChange={(el) => {
                         dispatch(
                           updateVhostOptions({
@@ -804,7 +826,11 @@ export function NativeApp({ name }: { name: string }) {
                       variant="filled"
                       className="form"
                       type="number"
-                      value={String(options.vhostServiceTokenTTL)}
+                      value={String(
+                        options
+                          ? options.vhostServiceTokenTTL
+                          : attributes.vhostServiceTokenTTL.default
+                      )}
                       onChange={(el) => {
                         dispatch(
                           updateVhostOptions({
diff --git a/src/components/applicationsComponents/OIDCApp.tsx b/src/components/applicationsComponents/OIDCApp.tsx
index 8dfe330..0022070 100644
--- a/src/components/applicationsComponents/OIDCApp.tsx
+++ b/src/components/applicationsComponents/OIDCApp.tsx
@@ -205,9 +205,11 @@ export function OIDCApp({ name }: { name: string }) {
                 <tr>
                   <th>
                     {t("oidcRPMetaDataOptionsClientID")}
-                    {data.oidcRPMetaDataOptions[name]
-                      .oidcRPMetaDataOptionsClientID === ""
-                      ? "⚠️"
+                    {data.oidcRPMetaDataOptions
+                      ? data.oidcRPMetaDataOptions[name]
+                          .oidcRPMetaDataOptionsClientID === ""
+                        ? "⚠️"
+                        : ""
                       : ""}
                   </th>
                   <td>
@@ -218,8 +220,13 @@ export function OIDCApp({ name }: { name: string }) {
                       className="form"
                       type="text"
                       value={String(
-                        data.oidcRPMetaDataOptions[name]
-                          .oidcRPMetaDataOptionsClientID
+                        data.oidcRPMetaDataOptions
+                          ? data.oidcRPMetaDataOptions[name]
+                              .oidcRPMetaDataOptionsClientID
+                            ? data.oidcRPMetaDataOptions[name]
+                                .oidcRPMetaDataOptionsClientID
+                            : ""
+                          : ""
                       )}
                       onChange={(e) => {
                         dispatch(
@@ -236,12 +243,16 @@ export function OIDCApp({ name }: { name: string }) {
                 <tr>
                   <th>
                     {t("oidcRPMetaDataOptionsPublic")}
-                    {data.oidcRPMetaDataOptions[name]
+                    {data.oidcRPMetaDataOptions
                       ? data.oidcRPMetaDataOptions[name]
-                          .oidcRPMetaDataOptionsPublic ||
-                        data.oidcRPMetaDataOptions[name]
-                          .oidcRPMetaDataOptionsClientSecret !== ""
-                        ? ""
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsPublic ||
+                          (data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsClientSecret &&
+                            data.oidcRPMetaDataOptions[name]
+                              .oidcRPMetaDataOptionsClientSecret !== "")
+                          ? ""
+                          : "⚠️"
                         : "⚠️"
                       : "⚠️"}
                   </th>
@@ -250,8 +261,10 @@ export function OIDCApp({ name }: { name: string }) {
                       <RadioGroup
                         row
                         value={
-                          data.oidcRPMetaDataOptions[name]
-                            .oidcRPMetaDataOptionsPublic
+                          data.oidcRPMetaDataOptions
+                            ? data.oidcRPMetaDataOptions[name]
+                                .oidcRPMetaDataOptionsPublic
+                            : 0
                         }
                         onChange={(e) => {
                           dispatch(
@@ -281,12 +294,16 @@ export function OIDCApp({ name }: { name: string }) {
                 <tr>
                   <th>
                     {t("oidcRPMetaDataOptionsClientSecret")}
-                    {data.oidcRPMetaDataOptions[name]
+                    {data.oidcRPMetaDataOptions
                       ? data.oidcRPMetaDataOptions[name]
-                          .oidcRPMetaDataOptionsPublic ||
-                        data.oidcRPMetaDataOptions[name]
-                          .oidcRPMetaDataOptionsClientSecret !== ""
-                        ? ""
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsPublic ||
+                          (data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsClientSecret &&
+                            data.oidcRPMetaDataOptions[name]
+                              .oidcRPMetaDataOptionsClientSecret !== "")
+                          ? ""
+                          : "⚠️"
                         : "⚠️"
                       : "⚠️"}
                   </th>
@@ -297,10 +314,17 @@ export function OIDCApp({ name }: { name: string }) {
                       variant="filled"
                       className="form"
                       type={attributes.oidcRPMetaDataOptionsClientSecret.type}
-                      value={String(
-                        data.oidcRPMetaDataOptions[name]
-                          .oidcRPMetaDataOptionsClientSecret
-                      )}
+                      value={
+                        data.oidcRPMetaDataOptions
+                          ? data.oidcRPMetaDataOptions[name]
+                              .oidcRPMetaDataOptionsClientSecret
+                            ? String(
+                                data.oidcRPMetaDataOptions[name]
+                                  .oidcRPMetaDataOptionsClientSecret
+                              )
+                            : ""
+                          : ""
+                      }
                       onChange={(e) => {
                         dispatch(
                           updateOidcMetaDataOptions({
@@ -323,8 +347,10 @@ export function OIDCApp({ name }: { name: string }) {
                       type={attributes.oidcRPMetaDataOptionsRedirectUris.type}
                       name="oidcRPMetaDataOptionsRedirectUris"
                       value={String(
-                        data.oidcRPMetaDataOptions[name]
-                          .oidcRPMetaDataOptionsRedirectUris
+                        data.oidcRPMetaDataOptions
+                          ? data.oidcRPMetaDataOptions[name]
+                              .oidcRPMetaDataOptionsRedirectUris
+                          : ""
                       )}
                       onChange={(e) => {
                         dispatch(
@@ -348,8 +374,10 @@ export function OIDCApp({ name }: { name: string }) {
                       type={attributes.oidcRPMetaDataOptionsAuthMethod.type}
                       name="oidcRPMetaDataOptionsAuthMethod"
                       value={String(
-                        data.oidcRPMetaDataOptions[name]
-                          .oidcRPMetaDataOptionsAuthMethod
+                        data.oidcRPMetaDataOptions
+                          ? data.oidcRPMetaDataOptions[name]
+                              .oidcRPMetaDataOptionsAuthMethod
+                          : ""
                       )}
                       onChange={(e) => {
                         dispatch(
@@ -372,10 +400,12 @@ export function OIDCApp({ name }: { name: string }) {
                       variant="filled"
                       type="text"
                       value={String(
-                        data.oidcRPMetaDataOptions[name]
-                          .oidcRPMetaDataOptionsDisplay
+                        data.oidcRPMetaDataOptions
                           ? data.oidcRPMetaDataOptions[name]
                               .oidcRPMetaDataOptionsDisplay
+                            ? data.oidcRPMetaDataOptions[name]
+                                .oidcRPMetaDataOptionsDisplay
+                            : ""
                           : ""
                       )}
                       onChange={(e) => {
@@ -399,8 +429,10 @@ export function OIDCApp({ name }: { name: string }) {
                       variant="filled"
                       type={attributes.oidcRPMetaDataOptionsIcon.type}
                       value={String(
-                        data.oidcRPMetaDataOptions[name]
-                          .oidcRPMetaDataOptionsIcon
+                        data.oidcRPMetaDataOptions
+                          ? data.oidcRPMetaDataOptions[name]
+                              .oidcRPMetaDataOptionsIcon
+                          : ""
                       )}
                       onChange={(e) => {
                         dispatch(
@@ -483,6 +515,7 @@ export function OIDCApp({ name }: { name: string }) {
                     name,
                     data.oidcRPMetaDataMacros[name],
                     "oidcRPMetaDataMacros",
+                    dispatch,
                     delOIDCRPMetaDataMacros,
                     updateOIDCRPMetaDataMacros
                   )
diff --git a/src/components/applicationsComponents/OptionOidc.tsx b/src/components/applicationsComponents/OptionOidc.tsx
index 49c44eb..755831c 100644
--- a/src/components/applicationsComponents/OptionOidc.tsx
+++ b/src/components/applicationsComponents/OptionOidc.tsx
@@ -77,8 +77,10 @@ export function OptionOidc({ name }: { name: string }) {
                   <RadioGroup
                     row
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsBypassConsent
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsBypassConsent
+                        : attributes.oidcRPMetaDataOptionsBypassConsent.default
                     }
                     onChange={(e) => {
                       dispatch(
@@ -111,8 +113,11 @@ export function OptionOidc({ name }: { name: string }) {
                   <RadioGroup
                     row
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsIDTokenForceClaims
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsIDTokenForceClaims
+                        : attributes.oidcRPMetaDataOptionsIDTokenForceClaims
+                            .default
                     }
                     onChange={(e) => {
                       dispatch(
@@ -145,8 +150,10 @@ export function OptionOidc({ name }: { name: string }) {
                   <RadioGroup
                     row
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsAccessTokenJWT
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsAccessTokenJWT
+                        : attributes.oidcRPMetaDataOptionsAccessTokenJWT.default
                     }
                     onChange={(e) => {
                       dispatch(
@@ -179,8 +186,11 @@ export function OptionOidc({ name }: { name: string }) {
                   <RadioGroup
                     row
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsAccessTokenClaims
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsAccessTokenClaims
+                        : attributes.oidcRPMetaDataOptionsAccessTokenClaims
+                            .default
                     }
                     onChange={(e) => {
                       dispatch(
@@ -213,8 +223,10 @@ export function OptionOidc({ name }: { name: string }) {
                   <RadioGroup
                     row
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsRefreshToken
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsRefreshToken
+                        : attributes.oidcRPMetaDataOptionsRefreshToken.default
                     }
                     onChange={(e) => {
                       dispatch(
@@ -250,10 +262,12 @@ export function OptionOidc({ name }: { name: string }) {
                   className="form"
                   type="text"
                   value={String(
-                    data.oidcRPMetaDataOptions[name]
-                      .oidcRPMetaDataOptionsUserIDAttr
+                    data.oidcRPMetaDataOptions
                       ? data.oidcRPMetaDataOptions[name]
                           .oidcRPMetaDataOptionsUserIDAttr
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsUserIDAttr
+                        : ""
                       : ""
                   )}
                   onChange={(e) => {
@@ -278,10 +292,12 @@ export function OptionOidc({ name }: { name: string }) {
                   className="form"
                   type="text"
                   value={String(
-                    data.oidcRPMetaDataOptions[name]
-                      .oidcRPMetaDataOptionsAdditionalAudiences
+                    data.oidcRPMetaDataOptions
                       ? data.oidcRPMetaDataOptions[name]
                           .oidcRPMetaDataOptionsAdditionalAudiences
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsAdditionalAudiences
+                        : ""
                       : ""
                   )}
                   onChange={(e) => {
@@ -326,6 +342,7 @@ export function OptionOidc({ name }: { name: string }) {
                   ? data.oidcRPMetaDataOptionsExtraClaims[name]
                   : {},
                 "oidcRPMetaDataOptionsExtraClaims",
+                dispatch,
                 delOidcRPMetaDataOptionsExtraClaims,
                 updateOidcRPMetaDataOptionsExtraClaims
               )}
@@ -360,6 +377,7 @@ export function OptionOidc({ name }: { name: string }) {
                   ? data.oidcRPMetaDataScopeRules[name]
                   : {},
                 "oidcRPMetaDataScopeRules",
+                dispatch,
                 delOidcRPMetaDataScopeRules,
                 updateOidcRPMetaDataScopeRules
               )}
@@ -385,8 +403,10 @@ export function OptionOidc({ name }: { name: string }) {
                   </InputLabel>
                   <Select
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsIDTokenSignAlg
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsIDTokenSignAlg
+                        : attributes.oidcRPMetaDataOptionsIDTokenSignAlg.default
                     }
                     label={t("oidcRPMetaDataOptionsIDTokenSignAlg")}
                     onChange={(e) =>
@@ -421,8 +441,11 @@ export function OptionOidc({ name }: { name: string }) {
                   </InputLabel>
                   <Select
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsAccessTokenSignAlg
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsAccessTokenSignAlg
+                        : attributes.oidcRPMetaDataOptionsAccessTokenSignAlg
+                            .default
                     }
                     label={t("oidcRPMetaDataOptionsAccessTokenSignAlg")}
                     onChange={(e) =>
@@ -457,8 +480,11 @@ export function OptionOidc({ name }: { name: string }) {
                   </InputLabel>
                   <Select
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsUserInfoSignAlg
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsUserInfoSignAlg
+                        : attributes.oidcRPMetaDataOptionsUserInfoSignAlg
+                            .default
                     }
                     displayEmpty
                     label={t("oidcRPMetaDataOptionsUserInfoSignAlg")}
@@ -488,8 +514,10 @@ export function OptionOidc({ name }: { name: string }) {
                   <RadioGroup
                     row
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsRequirePKCE
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsRequirePKCE
+                        : attributes.oidcRPMetaDataOptionsRequirePKCE.default
                     }
                     onChange={(e) => {
                       dispatch(
@@ -522,8 +550,10 @@ export function OptionOidc({ name }: { name: string }) {
                   <RadioGroup
                     row
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsAllowOffline
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsAllowOffline
+                        : attributes.oidcRPMetaDataOptionsAllowOffline.default
                     }
                     onChange={(e) => {
                       dispatch(
@@ -556,8 +586,11 @@ export function OptionOidc({ name }: { name: string }) {
                   <RadioGroup
                     row
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsAllowPasswordGrant
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsAllowPasswordGrant
+                        : attributes.oidcRPMetaDataOptionsAllowPasswordGrant
+                            .default
                     }
                     onChange={(e) => {
                       dispatch(
@@ -590,8 +623,12 @@ export function OptionOidc({ name }: { name: string }) {
                   <RadioGroup
                     row
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsAllowClientCredentialsGrant
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsAllowClientCredentialsGrant
+                        : attributes
+                            .oidcRPMetaDataOptionsAllowClientCredentialsGrant
+                            .default
                     }
                     onChange={(e) => {
                       dispatch(
@@ -628,10 +665,12 @@ export function OptionOidc({ name }: { name: string }) {
                   className="form"
                   type="text"
                   value={String(
-                    data.oidcRPMetaDataOptions[name]
-                      .oidcRPMetaDataOptionsRequestUris
+                    data.oidcRPMetaDataOptions
                       ? data.oidcRPMetaDataOptions[name]
                           .oidcRPMetaDataOptionsRequestUris
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsRequestUris
+                        : ""
                       : ""
                   )}
                   onChange={(e) => {
@@ -656,10 +695,12 @@ export function OptionOidc({ name }: { name: string }) {
                   className="form"
                   type="text"
                   value={String(
-                    data.oidcRPMetaDataOptions[name]
-                      .oidcRPMetaDataOptionsAuthnLevel
+                    data.oidcRPMetaDataOptions
                       ? data.oidcRPMetaDataOptions[name]
                           .oidcRPMetaDataOptionsAuthnLevel
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsAuthnLevel
+                        : ""
                       : ""
                   )}
                   onChange={(e) => {
@@ -684,9 +725,12 @@ export function OptionOidc({ name }: { name: string }) {
                   className="form"
                   type="text"
                   value={String(
-                    data.oidcRPMetaDataOptions[name].oidcRPMetaDataOptionsRule
+                    data.oidcRPMetaDataOptions
                       ? data.oidcRPMetaDataOptions[name]
                           .oidcRPMetaDataOptionsRule
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsRule
+                        : ""
                       : ""
                   )}
                   onChange={(e) => {
@@ -710,8 +754,10 @@ export function OptionOidc({ name }: { name: string }) {
                   </InputLabel>
                   <Select
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsAccessTokenEncKeyMgtAlg
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsAccessTokenEncKeyMgtAlg
+                        : ""
                     }
                     label={t("oidcRPMetaDataOptionsAccessTokenEncKeyMgtAlg")}
                     displayEmpty
@@ -744,8 +790,12 @@ export function OptionOidc({ name }: { name: string }) {
                   </InputLabel>
                   <Select
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsAccessTokenEncContentEncAlg
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsAccessTokenEncContentEncAlg
+                        : attributes
+                            .oidcRPMetaDataOptionsAccessTokenEncContentEncAlg
+                            .default
                     }
                     label={t(
                       "oidcRPMetaDataOptionsAccessTokenEncContentEncAlg"
@@ -783,8 +833,10 @@ export function OptionOidc({ name }: { name: string }) {
                   </InputLabel>
                   <Select
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsIdTokenEncKeyMgtAlg
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsIdTokenEncKeyMgtAlg
+                        : ""
                     }
                     displayEmpty
                     defaultValue=""
@@ -821,8 +873,12 @@ export function OptionOidc({ name }: { name: string }) {
                   </InputLabel>
                   <Select
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsIdTokenEncContentEncAlg
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsIdTokenEncContentEncAlg
+                        : attributes
+                            .oidcRPMetaDataOptionsIdTokenEncContentEncAlg
+                            .default
                     }
                     label={t("oidcRPMetaDataOptionsIdTokenEncContentEncAlg")}
                     onChange={(e) =>
@@ -858,8 +914,10 @@ export function OptionOidc({ name }: { name: string }) {
                   </InputLabel>
                   <Select
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsUserInfoEncKeyMgtAlg
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsUserInfoEncKeyMgtAlg
+                        : ""
                     }
                     displayEmpty
                     defaultValue=""
@@ -896,8 +954,12 @@ export function OptionOidc({ name }: { name: string }) {
                   </InputLabel>
                   <Select
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsUserInfoEncContentEncAlg
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsUserInfoEncContentEncAlg
+                        : attributes
+                            .oidcRPMetaDataOptionsUserInfoEncContentEncAlg
+                            .default
                     }
                     label={t("oidcRPMetaDataOptionsUserInfoEncContentEncAlg")}
                     onChange={(e) =>
@@ -933,8 +995,10 @@ export function OptionOidc({ name }: { name: string }) {
                   </InputLabel>
                   <Select
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsLogoutEncKeyMgtAlg
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsLogoutEncKeyMgtAlg
+                        : ""
                     }
                     displayEmpty
                     defaultValue=""
@@ -971,8 +1035,11 @@ export function OptionOidc({ name }: { name: string }) {
                   </InputLabel>
                   <Select
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsLogoutEncContentEncAlg
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsLogoutEncContentEncAlg
+                        : attributes.oidcRPMetaDataOptionsLogoutEncContentEncAlg
+                            .default
                     }
                     label={t("oidcRPMetaDataOptionsLogoutEncContentEncAlg")}
                     onChange={(e) =>
@@ -1014,10 +1081,12 @@ export function OptionOidc({ name }: { name: string }) {
                   className="form"
                   type="text"
                   value={String(
-                    data.oidcRPMetaDataOptions[name]
-                      .oidcRPMetaDataOptionsJwksUri
+                    data.oidcRPMetaDataOptions
                       ? data.oidcRPMetaDataOptions[name]
                           .oidcRPMetaDataOptionsJwksUri
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsJwksUri
+                        : ""
                       : ""
                   )}
                   onChange={(e) => {
@@ -1045,11 +1114,13 @@ export function OptionOidc({ name }: { name: string }) {
                   placeholder="oidcRPMetaDataOptionsJwks"
                   value={String(
                     name
-                      ? data.oidcRPMetaDataOptions[name]
+                      ? data.oidcRPMetaDataOptions
                         ? data.oidcRPMetaDataOptions[name]
-                            .oidcRPMetaDataOptionsJwks
                           ? data.oidcRPMetaDataOptions[name]
                               .oidcRPMetaDataOptionsJwks
+                            ? data.oidcRPMetaDataOptions[name]
+                                .oidcRPMetaDataOptionsJwks
+                            : ""
                           : ""
                         : ""
                       : ""
@@ -1116,10 +1187,12 @@ export function OptionOidc({ name }: { name: string }) {
                   variant="filled"
                   type="number"
                   value={String(
-                    data.oidcRPMetaDataOptions[name]
-                      .oidcRPMetaDataOptionsAuthorizationCodeExpiration
+                    data.oidcRPMetaDataOptions
                       ? data.oidcRPMetaDataOptions[name]
                           .oidcRPMetaDataOptionsAuthorizationCodeExpiration
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsAuthorizationCodeExpiration
+                        : ""
                       : ""
                   )}
                   onChange={(e) => {
@@ -1144,10 +1217,12 @@ export function OptionOidc({ name }: { name: string }) {
                   variant="filled"
                   type="number"
                   value={String(
-                    data.oidcRPMetaDataOptions[name]
-                      .oidcRPMetaDataOptionsIDTokenExpiration
+                    data.oidcRPMetaDataOptions
                       ? data.oidcRPMetaDataOptions[name]
                           .oidcRPMetaDataOptionsIDTokenExpiration
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsIDTokenExpiration
+                        : ""
                       : ""
                   )}
                   onChange={(e) => {
@@ -1171,10 +1246,12 @@ export function OptionOidc({ name }: { name: string }) {
                   variant="filled"
                   type="number"
                   value={String(
-                    data.oidcRPMetaDataOptions[name]
-                      .oidcRPMetaDataOptionsAccessTokenExpiration
+                    data.oidcRPMetaDataOptions
                       ? data.oidcRPMetaDataOptions[name]
                           .oidcRPMetaDataOptionsAccessTokenExpiration
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsAccessTokenExpiration
+                        : ""
                       : ""
                   )}
                   onChange={(e) => {
@@ -1198,10 +1275,12 @@ export function OptionOidc({ name }: { name: string }) {
                   variant="filled"
                   type="number"
                   value={String(
-                    data.oidcRPMetaDataOptions[name]
-                      .oidcRPMetaDataOptionsOfflineSessionExpiration
+                    data.oidcRPMetaDataOptions
                       ? data.oidcRPMetaDataOptions[name]
                           .oidcRPMetaDataOptionsOfflineSessionExpiration
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsOfflineSessionExpiration
+                        : ""
                       : ""
                   )}
                   onChange={(e) => {
@@ -1229,8 +1308,11 @@ export function OptionOidc({ name }: { name: string }) {
                   <RadioGroup
                     row
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsLogoutBypassConfirm
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsLogoutBypassConfirm
+                        : attributes.oidcRPMetaDataOptionsLogoutBypassConfirm
+                            .default
                     }
                     onChange={(e) => {
                       dispatch(
@@ -1263,8 +1345,11 @@ export function OptionOidc({ name }: { name: string }) {
                   <RadioGroup
                     row
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsLogoutSessionRequired
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsLogoutSessionRequired
+                        : attributes.oidcRPMetaDataOptionsLogoutSessionRequired
+                            .default
                     }
                     onChange={(e) => {
                       dispatch(
@@ -1299,8 +1384,10 @@ export function OptionOidc({ name }: { name: string }) {
                   </InputLabel>
                   <Select
                     value={
-                      data.oidcRPMetaDataOptions[name]
-                        .oidcRPMetaDataOptionsLogoutType
+                      data.oidcRPMetaDataOptions
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsLogoutType
+                        : attributes.oidcRPMetaDataOptionsLogoutType.default
                     }
                     label={t("oidcRPMetaDataOptionsLogoutType")}
                     onChange={(e) =>
@@ -1335,10 +1422,12 @@ export function OptionOidc({ name }: { name: string }) {
                   variant="filled"
                   type="text"
                   value={String(
-                    data.oidcRPMetaDataOptions[name]
-                      .oidcRPMetaDataOptionsLogoutUrl
+                    data.oidcRPMetaDataOptions
                       ? data.oidcRPMetaDataOptions[name]
                           .oidcRPMetaDataOptionsLogoutUrl
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsLogoutUrl
+                        : ""
                       : ""
                   )}
                   onChange={(e) => {
@@ -1362,10 +1451,12 @@ export function OptionOidc({ name }: { name: string }) {
                   variant="filled"
                   type="text"
                   value={String(
-                    data.oidcRPMetaDataOptions[name]
-                      .oidcRPMetaDataOptionsPostLogoutRedirectUris
+                    data.oidcRPMetaDataOptions
                       ? data.oidcRPMetaDataOptions[name]
                           .oidcRPMetaDataOptionsPostLogoutRedirectUris
+                        ? data.oidcRPMetaDataOptions[name]
+                            .oidcRPMetaDataOptionsPostLogoutRedirectUris
+                        : ""
                       : ""
                   )}
                   onChange={(e) => {
@@ -1392,8 +1483,10 @@ export function OptionOidc({ name }: { name: string }) {
           fullWidth
           rows={4}
           value={String(
-            data.oidcRPMetaDataOptions[name].oidcRPMetaDataOptionsComment
+            data.oidcRPMetaDataOptions
               ? data.oidcRPMetaDataOptions[name].oidcRPMetaDataOptionsComment
+                ? data.oidcRPMetaDataOptions[name].oidcRPMetaDataOptionsComment
+                : ""
               : ""
           )}
           onChange={(e) => {
diff --git a/src/components/applicationsComponents/SAMLApp.tsx b/src/components/applicationsComponents/SAMLApp.tsx
index d5114e7..28059d6 100644
--- a/src/components/applicationsComponents/SAMLApp.tsx
+++ b/src/components/applicationsComponents/SAMLApp.tsx
@@ -257,11 +257,13 @@ export function SAMLApp({ name }: { name: string }) {
             <strong className="title2">
               {t("samlSPMetaDataXML")}
               {name
-                ? data.samlSPMetaDataXML[name]
-                  ? data.samlSPMetaDataXML[name].samlSPMetaDataXML === ""
-                    ? "⚠️"
-                    : ""
-                  : "⚠️"
+                ? data.samlSPMetaDataXML
+                  ? data.samlSPMetaDataXML[name]
+                    ? data.samlSPMetaDataXML[name].samlSPMetaDataXML === ""
+                      ? "⚠️"
+                      : ""
+                    : "⚠️"
+                  : ""
                 : "⚠️"}
             </strong>
             <div>
@@ -283,8 +285,10 @@ export function SAMLApp({ name }: { name: string }) {
                 }
                 value={
                   name
-                    ? data.samlSPMetaDataXML[name]
-                      ? data.samlSPMetaDataXML[name].samlSPMetaDataXML
+                    ? data.samlSPMetaDataXML
+                      ? data.samlSPMetaDataXML[name]
+                        ? data.samlSPMetaDataXML[name].samlSPMetaDataXML
+                        : undefined
                       : undefined
                     : undefined
                 }
@@ -388,6 +392,7 @@ export function SAMLApp({ name }: { name: string }) {
                     name,
                     data.samlSPMetaDataMacros[name],
                     "samlSPMetaDataMacros",
+                    dispatch,
                     delSAMLSPMetaDataMacros,
                     updateSAMLSPMetaDataMacros
                   )
diff --git a/src/components/applicationsComponents/TableVars.tsx b/src/components/applicationsComponents/TableVars.tsx
index da1a950..b7632bf 100644
--- a/src/components/applicationsComponents/TableVars.tsx
+++ b/src/components/applicationsComponents/TableVars.tsx
@@ -1,15 +1,14 @@
 import { Button, TextField } from "@mui/material";
-import { useAppDispatch } from "../../app/hooks";
 import RemoveCircleIcon from "@mui/icons-material/RemoveCircle";
 
 export function TableVars(
   appName: string,
   vars: Record<string, string>,
   tableID: string,
+  dispatch: Function,
   delFunction: Function,
   updateFunction: Function
 ) {
-  const dispatch = useAppDispatch();
   let i = 0;
   return (
     <tbody>
diff --git a/src/components/managerComponents/AppCard.tsx b/src/components/managerComponents/AppCard.tsx
index b6bd429..6c729a8 100644
--- a/src/components/managerComponents/AppCard.tsx
+++ b/src/components/managerComponents/AppCard.tsx
@@ -22,11 +22,12 @@ function Maintenance(
     config: Record<string, boolean | number | string>;
   }
 ): boolean {
-  const maintenanceToggled = useAppSelector(
-    (state) => state.config.data.config.vhostOptions[info.name]
-  );
-
-  if (type === "native") {
+  const maintenanceToggled = useAppSelector((state) => {
+    if (state.config.data.config.vhostOptions) {
+      return state.config.data.config.vhostOptions[info.name];
+    }
+  });
+  if (maintenanceToggled && type === "native") {
     return Boolean(maintenanceToggled.vhostMaintenance);
   }
   return false;
diff --git a/src/components/managerComponents/CreationAssistant.tsx b/src/components/managerComponents/CreationAssistant.tsx
index afcc5dd..f8f5c94 100644
--- a/src/components/managerComponents/CreationAssistant.tsx
+++ b/src/components/managerComponents/CreationAssistant.tsx
@@ -20,7 +20,7 @@ export function CreationAssistant({
 }: {
   closeModal: MouseEventHandler<HTMLButtonElement>;
 }) {
-  const [appType, setAppType] = useState("None");
+  const [appType, setAppType] = useState("native");
   const [page, setPage] = useState(0);
   const [name, setName] = useState(attributes.virtualHostName.default);
   const dispatch = useAppDispatch();
@@ -88,6 +88,7 @@ export function CreationAssistant({
                   onClick={(e) => {
                     closeModal(e);
                     setPage(page - 1);
+                    setAppType("native");
                     dispatch(delApp(name));
                   }}
                 >
@@ -95,6 +96,7 @@ export function CreationAssistant({
                 </Button>
                 <Button
                   onClick={() => {
+                    console.log(appType);
                     if (name && appType !== "None") {
                       setPage(page + 1);
                       dispatch(newApp({ name, type: appType }));
@@ -133,18 +135,19 @@ export function CreationAssistant({
                 <Button
                   variant="outlined"
                   onClick={() => {
-                    console.log(
-                      data.oidcRPMetaDataOptions[name]
-                        ?.oidcRPMetaDataOptionsClientID !== undefined,
-                      data.samlSPMetaDataXML[name]?.samlSPMetaDataXML !== ""
-                    );
                     if (
-                      data.oidcRPMetaDataOptions[name]
+                      (data.oidcRPMetaDataOptions
                         ? data.oidcRPMetaDataOptions[name]
-                            .oidcRPMetaDataOptionsClientID !== ""
-                        : false || data.samlSPMetaDataXML[name]
-                        ? data.samlSPMetaDataXML[name].samlSPMetaDataXML !== ""
-                        : false
+                          ? data.oidcRPMetaDataOptions[name]
+                              .oidcRPMetaDataOptionsClientID !== ""
+                          : false
+                        : false) ||
+                      (data.samlSPMetaDataXML
+                        ? data.samlSPMetaDataXML[name]
+                          ? data.samlSPMetaDataXML[name].samlSPMetaDataXML !==
+                            ""
+                          : false
+                        : false)
                     ) {
                       setPage(page + 1);
                     }
diff --git a/src/components/managerComponents/IssuerAssistant.tsx b/src/components/managerComponents/IssuerAssistant.tsx
index a3a999c..d025801 100644
--- a/src/components/managerComponents/IssuerAssistant.tsx
+++ b/src/components/managerComponents/IssuerAssistant.tsx
@@ -59,10 +59,20 @@ export function IssuerAssistant({
     setStep(step - 1);
   };
 
-  const handleGenerateKeys = async () => {
+  const handleGenerateKeys = async (type: string) => {
     try {
       const result = await GenerateKeys();
-      setNewKeysOIDC(result);
+
+      switch (type) {
+        case "oidc":
+          setNewKeysOIDC(result);
+          break;
+        case "saml":
+          setNewKeysSAML(result);
+          break;
+        default:
+          break;
+      }
     } catch (error) {
       console.error("Error generating keys:", error);
     }
@@ -86,6 +96,7 @@ export function IssuerAssistant({
           <ButtonGroup variant="outlined">
             <Button
               onClick={() => {
+                console.log("cancel");
                 onIgnore();
                 setStep(0);
               }}
@@ -196,12 +207,11 @@ export function IssuerAssistant({
             <Button
               variant="outlined"
               className="generateButton"
-              onClick={handleGenerateKeys}
+              onClick={() => handleGenerateKeys("saml")}
             >
               {t("newRSAKey")}
             </Button>
             <div>
-              {" "}
               <ButtonGroup variant="outlined">
                 <Button
                   onClick={() => {
@@ -331,7 +341,7 @@ export function IssuerAssistant({
             <Button
               variant="outlined"
               className="generateButton"
-              onClick={handleGenerateKeys}
+              onClick={() => handleGenerateKeys("oidc")}
             >
               {t("newRSAKey")}
             </Button>
diff --git a/src/components/managerComponents/Issuers.tsx b/src/components/managerComponents/Issuers.tsx
index f6c1bb9..f673d05 100644
--- a/src/components/managerComponents/Issuers.tsx
+++ b/src/components/managerComponents/Issuers.tsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import ToggleButton from "../ToggleButton";
 import { useAppDispatch, useAppSelector } from "./../../app/hooks";
 import {
@@ -46,6 +46,38 @@ function Issuers() {
   const handleClose = () => {
     setAnchorEl(null);
   };
+
+  useEffect(() => {
+    setWarnings({
+      samlWarning:
+        !config.issuerDBSAMLActivation &&
+        Boolean(
+          Object.keys(config.samlSPMetaDataXML ? config.samlSPMetaDataXML : {})
+            .length
+        ),
+      oidcWarning:
+        !config.issuerDBOpenIDConnectActivation &&
+        Boolean(
+          Object.keys(
+            config.oidcOPMetaDataOptions ? config.oidcOPMetaDataOptions : {}
+          ).length
+        ),
+      casWarning:
+        !config.issuerDBCASActivation &&
+        Boolean(
+          Object.keys(
+            config.casAppMetaDataOptions ? config.casAppMetaDataOptions : {}
+          ).length
+        ),
+    });
+  }, [
+    config.issuerDBSAMLActivation,
+    config.samlSPMetaDataXML,
+    config.issuerDBOpenIDConnectActivation,
+    config.oidcRPMetaDataOptions,
+    config.issuerDBCASActivation,
+    config.casAppMetaDataOptions,
+  ]);
   return (
     <div className="issuersList">
       <div className="issuers" data-testid="issuer.saml">
@@ -55,7 +87,7 @@ function Issuers() {
             data-testid="issuer.toggle.saml"
             color="secondary"
             className="switch"
-            checked={config.issuerDBSAMLActivation}
+            checked={Boolean(config.issuerDBSAMLActivation)}
             onChange={() => {
               if (
                 !config.issuerDBSAMLActivation &&
@@ -67,7 +99,8 @@ function Issuers() {
                 dispatch(toggleSAML());
                 setWarnings({
                   ...warnings,
-                  samlWarning: !warnings.samlWarning,
+                  samlWarning:
+                    !warnings.samlWarning && Boolean(config.samlSPMetaDataXML),
                 });
               }
             }}
@@ -81,7 +114,11 @@ function Issuers() {
           }}
           setVisible={(e) => {
             triggerSAMLIssuerAssistant(e);
-            setWarnings({ ...warnings, samlWarning: !warnings.samlWarning });
+            setWarnings({
+              ...warnings,
+              samlWarning:
+                !warnings.samlWarning && Boolean(config.samlSPMetaDataXML),
+            });
             dispatch(toggleSAML());
           }}
         />
@@ -118,10 +155,14 @@ function Issuers() {
               triggerOIDCIssuerAssistant(!issuerOIDCAssistant);
             } else {
               dispatch(toggleOIDC());
-              setWarnings({ ...warnings, oidcWarning: !warnings.oidcWarning });
+              setWarnings({
+                ...warnings,
+                oidcWarning:
+                  !warnings.oidcWarning &&
+                  Boolean(config.oidcRPMetaDataOptions),
+              });
             }
           }}
-          // testid="issuer.toggle.oidc"
         />
 
         <IssuerAssistant
@@ -132,7 +173,11 @@ function Issuers() {
           }}
           setVisible={(e) => {
             triggerOIDCIssuerAssistant(e);
-            setWarnings({ ...warnings, oidcWarning: !warnings.oidcWarning });
+            setWarnings({
+              ...warnings,
+              oidcWarning:
+                !warnings.oidcWarning && Boolean(config.oidcRPMetaDataOptions),
+            });
             dispatch(toggleOIDC());
           }}
         />
@@ -161,7 +206,11 @@ function Issuers() {
           data-testid="issuer.toggle.cas"
           checked={Boolean(config.issuerDBCASActivation)}
           onChange={() => {
-            setWarnings({ ...warnings, casWarning: !warnings.casWarning });
+            setWarnings({
+              ...warnings,
+              casWarning:
+                !warnings.casWarning && Boolean(config.casAppMetaDataOptions),
+            });
             dispatch(toggleCAS());
           }}
           // testid="issuer.toggle.cas"
diff --git a/src/components/managerComponents/MandatoryFields.tsx b/src/components/managerComponents/MandatoryFields.tsx
index 2f6219a..94b2050 100644
--- a/src/components/managerComponents/MandatoryFields.tsx
+++ b/src/components/managerComponents/MandatoryFields.tsx
@@ -65,8 +65,10 @@ export function MandatoryFields({
               }
               value={
                 name
-                  ? data.samlSPMetaDataXML[name]
-                    ? data.samlSPMetaDataXML[name].samlSPMetaDataXML
+                  ? data.samlSPMetaDataXML
+                    ? data.samlSPMetaDataXML[name]
+                      ? data.samlSPMetaDataXML[name].samlSPMetaDataXML
+                      : undefined
                     : undefined
                   : undefined
               }
@@ -108,95 +110,108 @@ export function MandatoryFields({
     case "oidc":
       return (
         <div className="mandatoryField">
-          <div>
-            <th>{t("oidcRPMetaDataOptionsClientID")}</th>
-            <td>
-              <TextField
-                size="small"
-                margin="normal"
-                variant="filled"
-                type="text"
-                placeholder={t("oidcRPMetaDataOptionsClientID")}
-                value={String(
-                  name
-                    ? data.oidcRPMetaDataOptions[name]
-                      ? data.oidcRPMetaDataOptions[name]
-                          .oidcRPMetaDataOptionsClientID
-                      : ""
-                    : ""
-                )}
-                onChange={(e) =>
-                  dispatch(
-                    updateOIDCclientID({
-                      name: name ? name : "",
-                      id: e.target.value,
-                    })
-                  )
-                }
-              />
-            </td>
-          </div>
-          <div>
-            <th>{t("oidcRPMetaDataOptionsClientSecret")}</th>
-            <td>
-              <TextField
-                size="small"
-                margin="normal"
-                variant="filled"
-                type="password"
-                placeholder={t("oidcRPMetaDataOptionsClientSecret")}
-                value={String(
-                  name
-                    ? data.oidcRPMetaDataOptions[name]
-                      ? data.oidcRPMetaDataOptions[name]
-                          .oidcRPMetaDataOptionsClientSecret
-                        ? data.oidcRPMetaDataOptions[name]
-                            .oidcRPMetaDataOptionsClientSecret
+          <table>
+            <tbody>
+              <tr>
+                <th>{t("oidcRPMetaDataOptionsClientID")}</th>
+                <td>
+                  <TextField
+                    size="small"
+                    margin="normal"
+                    variant="filled"
+                    type="text"
+                    placeholder={t("oidcRPMetaDataOptionsClientID")}
+                    value={
+                      name
+                        ? data.oidcRPMetaDataOptions
+                          ? data.oidcRPMetaDataOptions[name]
+                            ? data.oidcRPMetaDataOptions[name]
+                                .oidcRPMetaDataOptionsClientID
+                              ? String(
+                                  data.oidcRPMetaDataOptions[name]
+                                    .oidcRPMetaDataOptionsClientID
+                                )
+                              : ""
+                            : ""
+                          : ""
                         : ""
-                      : ""
-                    : ""
-                )}
-                onChange={(e) =>
-                  dispatch(
-                    updateOIDCPrivateClient({
-                      name: name ? name : "",
-                      privateClient: e.target.value,
-                    })
-                  )
-                }
-              />
-            </td>
-          </div>
-          <div>
-            <th>{t("oidcRPMetaDataOptionsPublic")}</th>
-            <td>
-              <FormControl>
-                <RadioGroup
-                  row
-                  value={data.samlSPMetaDataOptionsOneTimeUse}
-                  onChange={(e) => {
-                    dispatch(
-                      updateOIDCPublicClient({
-                        name: name ? name : "",
-                        publicClient: Number(e.target.value),
-                      })
-                    );
-                  }}
-                >
-                  <FormControlLabel
-                    value={1}
-                    control={<Radio />}
-                    label={t("on")}
+                    }
+                    onChange={(e) =>
+                      dispatch(
+                        updateOIDCclientID({
+                          name: name ? name : "",
+                          id: e.target.value,
+                        })
+                      )
+                    }
                   />
-                  <FormControlLabel
-                    value={0}
-                    control={<Radio />}
-                    label={t("off")}
+                </td>
+              </tr>
+              <tr>
+                <th>{t("oidcRPMetaDataOptionsClientSecret")}</th>
+                <td>
+                  <TextField
+                    size="small"
+                    margin="normal"
+                    variant="filled"
+                    type="password"
+                    placeholder={t("oidcRPMetaDataOptionsClientSecret")}
+                    value={String(
+                      name
+                        ? data.oidcRPMetaDataOptions
+                          ? data.oidcRPMetaDataOptions[name]
+                            ? data.oidcRPMetaDataOptions[name]
+                                .oidcRPMetaDataOptionsClientSecret
+                              ? data.oidcRPMetaDataOptions[name]
+                                  .oidcRPMetaDataOptionsClientSecret
+                              : ""
+                            : ""
+                          : ""
+                        : ""
+                    )}
+                    onChange={(e) =>
+                      dispatch(
+                        updateOIDCPrivateClient({
+                          name: name ? name : "",
+                          privateClient: e.target.value,
+                        })
+                      )
+                    }
                   />
-                </RadioGroup>
-              </FormControl>
-            </td>
-          </div>
+                </td>
+              </tr>
+              <tr>
+                <th>{t("oidcRPMetaDataOptionsPublic")}</th>
+                <td>
+                  <FormControl>
+                    <RadioGroup
+                      row
+                      value={data.samlSPMetaDataOptionsOneTimeUse}
+                      onChange={(e) => {
+                        dispatch(
+                          updateOIDCPublicClient({
+                            name: name ? name : "",
+                            publicClient: Number(e.target.value),
+                          })
+                        );
+                      }}
+                    >
+                      <FormControlLabel
+                        value={1}
+                        control={<Radio />}
+                        label={t("on")}
+                      />
+                      <FormControlLabel
+                        value={0}
+                        control={<Radio />}
+                        label={t("off")}
+                      />
+                    </RadioGroup>
+                  </FormControl>
+                </td>
+              </tr>
+            </tbody>
+          </table>
           <div></div>
         </div>
       );
diff --git a/src/dashboards/ApplicationDashboard.tsx b/src/dashboards/ApplicationDashboard.tsx
index 797cfec..328586c 100644
--- a/src/dashboards/ApplicationDashboard.tsx
+++ b/src/dashboards/ApplicationDashboard.tsx
@@ -2,6 +2,8 @@ import { NativeApp } from "../components/applicationsComponents/NativeApp";
 import { CasApp } from "../components/applicationsComponents/CasApp";
 import { SAMLApp } from "../components/applicationsComponents/SAMLApp";
 import { OIDCApp } from "../components/applicationsComponents/OIDCApp";
+import { useAppDispatch } from "../app/hooks";
+import { setError } from "../features/config/configSlice";
 
 export function ApplicationDashboard({
   name,
@@ -10,16 +12,24 @@ export function ApplicationDashboard({
   name: string;
   type: string;
 }) {
-  switch (type) {
-    case "native":
-      return <NativeApp name={name} />;
-    case "cas":
-      return <CasApp name={name} />;
-    case "saml":
-      return <SAMLApp name={name} />;
-    case "oidc":
-      return <OIDCApp name={name} />;
-    default:
-      return <div>¯\_(ツ)_/¯</div>;
+  const dispatch = useAppDispatch();
+  try {
+    switch (type) {
+      case "native":
+        return <NativeApp name={name} />;
+      case "cas":
+        return <CasApp name={name} />;
+      case "saml":
+        return <SAMLApp name={name} />;
+      case "oidc":
+        return <OIDCApp name={name} />;
+      default:
+        return <div>¯\_(ツ)_/¯</div>;
+    }
+  } catch (e) {
+    if (e instanceof Error) {
+      dispatch(setError(e.message));
+    }
+    return <div>e</div>;
   }
 }
diff --git a/src/dashboards/HomePage.tsx b/src/dashboards/HomePage.tsx
index b8d5a7c..84dcdfb 100644
--- a/src/dashboards/HomePage.tsx
+++ b/src/dashboards/HomePage.tsx
@@ -79,6 +79,12 @@ export function HomePage() {
                 <td>
                   <TextField
                     type="number"
+                    error={aimedConf <= 0}
+                    helperText={`${
+                      aimedConf === 0
+                        ? "Enter only positive and non nul numbers"
+                        : ""
+                    }`}
                     onChange={(e) => SetAimedConf(Number(e.target.value))}
                     onKeyDown={(e) => {
                       if (e.key === "Enter") {
@@ -92,7 +98,7 @@ export function HomePage() {
                           );
                       }
                     }}
-                  ></TextField>
+                  />
                   <Button
                     variant="contained"
                     onClick={() => {
diff --git a/src/dashboards/Manager.tsx b/src/dashboards/Manager.tsx
index 2b75a8b..9d9f744 100644
--- a/src/dashboards/Manager.tsx
+++ b/src/dashboards/Manager.tsx
@@ -33,10 +33,11 @@ export default function Manager() {
     setAnchorEl(event.currentTarget);
   };
   const [configPresent, setConfigPresent] = useState<boolean>(
-    Boolean(config.data.metadata && !config.loading && !config.error)
+    Boolean(config.data.metadata && !config.loading && !config.error.has)
   );
 
   useEffect(() => {
+    console.log(configNum, config.data.metadata.cfgNum);
     if (!configPresent) {
       setConfigPresent(true);
       dispatch(
@@ -50,15 +51,11 @@ export default function Manager() {
         dispatch(
           getConfigAsync(configNum === "latest" ? undefined : Number(configNum))
         );
+      } else if (configNum === "latest" && config.data.metadata.next) {
+        dispatch(getConfigAsync());
       }
     }
-  }, [
-    dispatch,
-    configNum,
-    config.data.metadata.cfgNum,
-    location,
-    configPresent,
-  ]);
+  }, [dispatch, configNum, config.data.metadata, location, configPresent]);
   try {
     if (config.loading) {
       return (
@@ -76,66 +73,97 @@ export default function Manager() {
         </div>
       );
     } else {
-      const nativeConfig = Object.keys(config.data.config.locationRules).map(
-        (key) => (
-          <AppCard
-            key={key}
-            type="native"
-            info={{ name: key, config: config.data.config.vhostOptions[key] }}
-            rule={true}
-          />
-        )
-      );
-      const samlConfig = Object.keys(config.data.config.samlSPMetaDataXML).map(
-        (key) => (
-          <AppCard
-            key={key}
-            type="saml"
-            info={{
-              name: key,
-              config: config.data.config.samlSPMetaDataXML[key],
-            }}
-            issuer={config.data.config.issuerDBSAMLActivation}
-            rule={ruleSAML(config.data.config.samlSPMetaDataXML[key])}
-          />
-        )
-      );
-      const oidcConfig = Object.keys(
-        config.data.config.oidcRPMetaDataOptions
-      ).map((key) => (
-        <AppCard
-          key={key}
-          type="oidc"
-          info={{
-            name: key,
-            config: config.data.config.oidcRPMetaDataOptions[key],
-          }}
-          issuer={config.data.config.issuerDBOpenIDConnectActivation}
-          rule={ruleOIDC(config.data.config.oidcRPMetaDataOptions[key])}
-        />
-      ));
-      const casConfig = Object.keys(
-        config.data.config.casAppMetaDataOptions
-      ).map((key) => (
-        <AppCard
-          key={key}
-          type="cas"
-          info={{
-            name: key,
-            config: config.data.config.casAppMetaDataOptions[key],
-          }}
-          issuer={config.data.config.issuerDBCASActivation}
-          rule={ruleCAS(config.data.config.casAppMetaDataOptions[key])}
-        />
-      ));
-
-      const renderedData = nativeConfig
-        .concat(samlConfig)
-        .concat(oidcConfig)
-        .concat(casConfig)
-        .filter((el) => {
-          return String(el.props.info.name).includes(filters.search);
-        });
+      const renderedData: JSX.Element[] = [];
+      if (config.data.config.locationRules) {
+        renderedData.push(
+          ...Object.keys(config.data.config.locationRules).map((key) => (
+            <AppCard
+              key={key}
+              type="native"
+              info={{
+                name: key,
+                config: config.data.config.vhostOptions
+                  ? config.data.config.vhostOptions[key]
+                  : {},
+              }}
+              rule={true}
+            />
+          ))
+        );
+      }
+      if (config.data.config.samlSPMetaDataXML) {
+        renderedData.push(
+          ...Object.keys(config.data.config.samlSPMetaDataXML).map((key) => (
+            <AppCard
+              key={key}
+              type="saml"
+              info={{
+                name: key,
+                config: config.data.config.samlSPMetaDataXML
+                  ? config.data.config.samlSPMetaDataXML[key]
+                  : {},
+              }}
+              issuer={config.data.config.issuerDBSAMLActivation}
+              rule={ruleSAML(
+                config.data.config.samlSPMetaDataXML
+                  ? config.data.config.samlSPMetaDataXML[key]
+                  : {}
+              )}
+            />
+          ))
+        );
+      }
+      if (config.data.config.oidcRPMetaDataOptions) {
+        renderedData.push(
+          ...Object.keys(config.data.config.oidcRPMetaDataOptions).map(
+            (key) => (
+              <AppCard
+                key={key}
+                type="oidc"
+                info={{
+                  name: key,
+                  config: config.data.config.oidcRPMetaDataOptions
+                    ? config.data.config.oidcRPMetaDataOptions[key]
+                    : {},
+                }}
+                issuer={config.data.config.issuerDBOpenIDConnectActivation}
+                rule={ruleOIDC(
+                  config.data.config.oidcRPMetaDataOptions
+                    ? config.data.config.oidcRPMetaDataOptions[key]
+                    : {}
+                )}
+              />
+            )
+          )
+        );
+      }
+      if (config.data.config.casAppMetaDataOptions) {
+        renderedData.push(
+          ...Object.keys(config.data.config.casAppMetaDataOptions).map(
+            (key) => (
+              <AppCard
+                key={key}
+                type="cas"
+                info={{
+                  name: key,
+                  config: config.data.config.casAppMetaDataOptions
+                    ? config.data.config.casAppMetaDataOptions[key]
+                    : {},
+                }}
+                issuer={config.data.config.issuerDBCASActivation}
+                rule={ruleCAS(
+                  config.data.config.casAppMetaDataOptions
+                    ? config.data.config.casAppMetaDataOptions[key]
+                    : {}
+                )}
+              />
+            )
+          )
+        );
+      }
+      renderedData.filter((el) => {
+        return String(el.props.info.name).includes(filters.search);
+      });
 
       if (filters.alpha) {
         renderedData.sort((el1, el2) =>
@@ -225,7 +253,7 @@ export default function Manager() {
             >
               <ArrowForwardIcon sx={{ marginRight: "15px" }} />
               {t("next")}
-            </MenuItem>{" "}
+            </MenuItem>
             <Divider />
             <MenuItem
               onClick={() => {
diff --git a/src/features/config/configSlice.ts b/src/features/config/configSlice.ts
index 3b789b9..4d015f4 100644
--- a/src/features/config/configSlice.ts
+++ b/src/features/config/configSlice.ts
@@ -44,8 +44,14 @@ const configSlice = createSlice({
       if (!state.data.config.vhostOptions) {
         state.data.config.vhostOptions = {};
       }
-      state.data.config.vhostOptions[action.payload].vhostMaintenance =
-        !state.data.config.vhostOptions[action.payload].vhostMaintenance;
+      if (state.data.config.vhostOptions[action.payload]) {
+        state.data.config.vhostOptions[action.payload].vhostMaintenance =
+          !state.data.config.vhostOptions[action.payload].vhostMaintenance;
+      } else {
+        state.data.config.vhostOptions[action.payload] = {
+          vhostMaintenance: true,
+        };
+      }
     },
     toggleSAML(state) {
       state.data.config.issuerDBSAMLActivation =
@@ -95,6 +101,9 @@ const configSlice = createSlice({
         locationRules: Record<string, string>;
       }>
     ) {
+      if (!state.data.config.locationRules) {
+        state.data.config.locationRules = {};
+      }
       state.data.config.locationRules[action.payload.appName] =
         action.payload.locationRules;
     },
@@ -102,10 +111,16 @@ const configSlice = createSlice({
       state,
       action: PayloadAction<{ appName: string; rule: string }>
     ) {
+      if (!state.data.config.locationRules) {
+        state.data.config.locationRules = {};
+      }
       state.data.config.locationRules[action.payload.appName].default =
         action.payload.rule;
     },
     newLocationRule(state, action: PayloadAction<string>) {
+      if (!state.data.config.locationRules) {
+        state.data.config.locationRules = {};
+      }
       state.data.config.locationRules[action.payload] = {
         ...state.data.config.locationRules[action.payload],
         "(?#New rule)^/new": "accept",
@@ -115,14 +130,19 @@ const configSlice = createSlice({
       state,
       action: PayloadAction<{ name: string; key: string }>
     ) {
-      delete state.data.config.locationRules[action.payload.name][
-        action.payload.key
-      ];
+      if (state.data.config.locationRules) {
+        delete state.data.config.locationRules[action.payload.name][
+          action.payload.key
+        ];
+      }
     },
     newVhostHeaders(state, action: PayloadAction<string>) {
       if (!state.data.config.exportedHeaders) {
         state.data.config.exportedHeaders = {};
       }
+      if (!state.data.config.exportedHeaders[action.payload]) {
+        state.data.config.exportedHeaders[action.payload] = {};
+      }
       state.data.config.exportedHeaders[action.payload] = {
         ...state.data.config.exportedHeaders[action.payload],
         new: "",
@@ -142,15 +162,18 @@ const configSlice = createSlice({
     updateVhostHeaders(
       state,
       action: PayloadAction<{
-        appName: string;
-        exportedHeaders: Record<string, string>;
+        name: string;
+        data: Record<string, string>;
       }>
     ) {
       if (!state.data.config.exportedHeaders) {
         state.data.config.exportedHeaders = {};
       }
-      state.data.config.exportedHeaders[action.payload.appName] =
-        action.payload.exportedHeaders;
+      if (!state.data.config.exportedHeaders[action.payload.name]) {
+        state.data.config.exportedHeaders[action.payload.name] = {};
+      }
+      state.data.config.exportedHeaders[action.payload.name] =
+        action.payload.data;
     },
     newVhostPost(state, action: PayloadAction<string>) {
       if (!state.data.config.post) {
@@ -247,9 +270,15 @@ const configSlice = createSlice({
     newApp(state, action: PayloadAction<{ name: string; type: string }>) {
       switch (action.payload.type) {
         case "native":
+          if (!state.data.config.locationRules) {
+            state.data.config.locationRules = {};
+          }
           state.data.config.locationRules[action.payload.name] =
             attributes.locationRules.default;
-
+          if (!state.data.config.vhostOptions) {
+            state.data.config.vhostOptions = {};
+          }
+          state.data.config.vhostOptions[action.payload.name] = {};
           if (!state.data.config.exportedHeaders) {
             state.data.config.exportedHeaders = {};
           }
@@ -260,29 +289,22 @@ const configSlice = createSlice({
           state.data.config.post[action.payload.name] = {};
           break;
         case "saml":
+          console.log(action.payload.name, state.data.config.samlSPMetaDataXML);
           if (!state.data.config.samlSPMetaDataXML) {
             state.data.config.samlSPMetaDataXML = {};
           }
           state.data.config.samlSPMetaDataXML[action.payload.name] = {
             samlSPMetaDataXML: "",
           };
-          if (!state.data.config.samlSPMetaDataExportedAttributes) {
-            state.data.config.samlSPMetaDataExportedAttributes = {};
-          }
-          state.data.config.samlSPMetaDataExportedAttributes[
-            action.payload.name
-          ] = attributes.samlSPMetaDataExportedAttributes.default;
-          if (!state.data.config.samlSPMetaDataMacros) {
-            state.data.config.samlSPMetaDataMacros =
-              attributes.samlSPMetaDataMacros.default;
-          }
-          state.data.config.samlSPMetaDataMacros[action.payload.name] = {};
           if (!state.data.config.samlSPMetaDataOptions) {
             state.data.config.samlSPMetaDataOptions = {};
           }
           state.data.config.samlSPMetaDataOptions[action.payload.name] = {};
           break;
         case "oidc":
+          if (!state.data.config.oidcRPMetaDataOptions) {
+            state.data.config.oidcRPMetaDataOptions = {};
+          }
           state.data.config.oidcRPMetaDataOptions[action.payload.name] = {
             oidcRPMetaDataOptionsAccessTokenClaims:
               attributes.oidcRPMetaDataOptionsAccessTokenClaims.default,
@@ -327,6 +349,9 @@ const configSlice = createSlice({
             attributes.oidcRPMetaDataMacros.default;
           break;
         case "cas":
+          if (!state.data.config.casAppMetaDataOptions) {
+            state.data.config.casAppMetaDataOptions = {};
+          }
           state.data.config.casAppMetaDataOptions[action.payload.name] = {
             casAppMetaDataOptionsService: "",
             casAppMetaDataOptionsLogout:
@@ -351,6 +376,9 @@ const configSlice = createSlice({
       state,
       action: PayloadAction<{ name: string; id: string }>
     ) {
+      if (!state.data.config.oidcRPMetaDataOptions) {
+        state.data.config.oidcRPMetaDataOptions = {};
+      }
       state.data.config.oidcRPMetaDataOptions[
         action.payload.name
       ].oidcRPMetaDataOptionsClientID = action.payload.id;
@@ -359,6 +387,9 @@ const configSlice = createSlice({
       state,
       action: PayloadAction<{ name: string; privateClient: string }>
     ) {
+      if (!state.data.config.oidcRPMetaDataOptions) {
+        state.data.config.oidcRPMetaDataOptions = {};
+      }
       state.data.config.oidcRPMetaDataOptions[
         action.payload.name
       ].oidcRPMetaDataOptionsClientSecret = action.payload.privateClient;
@@ -367,6 +398,9 @@ const configSlice = createSlice({
       state,
       action: PayloadAction<{ name: string; publicClient: number }>
     ) {
+      if (!state.data.config.oidcRPMetaDataOptions) {
+        state.data.config.oidcRPMetaDataOptions = {};
+      }
       state.data.config.oidcRPMetaDataOptions[
         action.payload.name
       ].oidcRPMetaDataOptionsPublic = action.payload.publicClient;
@@ -438,6 +472,9 @@ const configSlice = createSlice({
         value: boolean | number | string;
       }>
     ) {
+      if (!state.data.config.casAppMetaDataOptions) {
+        state.data.config.casAppMetaDataOptions = {};
+      }
       state.data.config.casAppMetaDataOptions[action.payload.name][
         action.payload.option
       ] = action.payload.value;
@@ -596,20 +633,22 @@ const configSlice = createSlice({
       if (!state.data.config.oidcRPMetaDataOptions) {
         state.data.config.samlSPMetaDataOptions = {};
       }
+      if (!state.data.config.oidcRPMetaDataOptions) {
+        state.data.config.oidcRPMetaDataOptions = {};
+      }
       state.data.config.oidcRPMetaDataOptions[action.payload.name][
         action.payload.option
       ] = action.payload.value;
     },
     updateOidcRPMetaDataOptionsExtraClaims(
       state,
-      action: PayloadAction<{ appName: string; data: Record<string, string> }>
+      action: PayloadAction<{ name: string; data: Record<string, string> }>
     ) {
       if (!state.data.config.oidcRPMetaDataOptionsExtraClaims) {
         state.data.config.oidcRPMetaDataOptionsExtraClaims = {};
       }
-      state.data.config.oidcRPMetaDataOptionsExtraClaims[
-        action.payload.appName
-      ] = action.payload.data;
+      state.data.config.oidcRPMetaDataOptionsExtraClaims[action.payload.name] =
+        action.payload.data;
     },
     newOidcRPMetaDataOptionsExtraClaims(state, action: PayloadAction<string>) {
       if (!state.data.config.oidcRPMetaDataOptionsExtraClaims) {
@@ -632,12 +671,12 @@ const configSlice = createSlice({
     },
     updateOidcRPMetaDataScopeRules(
       state,
-      action: PayloadAction<{ appName: string; data: Record<string, string> }>
+      action: PayloadAction<{ name: string; data: Record<string, string> }>
     ) {
       if (!state.data.config.oidcRPMetaDataScopeRules) {
         state.data.config.oidcRPMetaDataScopeRules = {};
       }
-      state.data.config.oidcRPMetaDataScopeRules[action.payload.appName] =
+      state.data.config.oidcRPMetaDataScopeRules[action.payload.name] =
         action.payload.data;
     },
     newOidcRPMetaDataScopeRules(state, action: PayloadAction<string>) {
@@ -663,6 +702,9 @@ const configSlice = createSlice({
       state,
       action: PayloadAction<{ name: string; data: string }>
     ) {
+      if (!state.data.config.oidcRPMetaDataOptions) {
+        state.data.config.oidcRPMetaDataOptions = {};
+      }
       state.data.config.oidcRPMetaDataOptions[
         action.payload.name
       ].oidcRPMetaDataOptionsJwks = action.payload.data;
diff --git a/src/utils/types.ts b/src/utils/types.ts
index b05df9c..60c2ae2 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -44,7 +44,7 @@ export interface llngConfig {
   casAppMetaDataExportedVars?: Record<string, Record<string, string>>;
   casAppMetaDataMacros?: Record<string, Record<string, string>>;
   casAppMetaDataNodes?: Record<string, object>;
-  casAppMetaDataOptions: Record<
+  casAppMetaDataOptions?: Record<
     string,
     Record<string, string | number | boolean>
   >;
@@ -256,12 +256,12 @@ export interface llngConfig {
   issuerDBGetPath?: string;
   issuerDBGetRule?: boolean | number | string;
   issuerDBOpenIDActivation?: boolean | number;
-  issuerDBOpenIDConnectActivation: boolean | number;
+  issuerDBOpenIDConnectActivation?: boolean | number;
   issuerDBOpenIDConnectPath?: string;
   issuerDBOpenIDConnectRule?: boolean | number | string;
   issuerDBOpenIDPath?: string;
   issuerDBOpenIDRule?: boolean | number | string;
-  issuerDBSAMLActivation: boolean;
+  issuerDBSAMLActivation?: boolean;
   issuerDBSAMLPath?: string;
   issuerDBSAMLRule?: boolean | number | string;
   issuersTimeout?: number;
@@ -318,7 +318,7 @@ export interface llngConfig {
   locationDetectGeoIpLanguages?: string;
   locationDetectIpDetail?: string;
   locationDetectUaDetail?: string;
-  locationRules: Record<string, Record<string, string>>;
+  locationRules?: Record<string, Record<string, string>>;
   log4perlConfFile?: string;
   logLevel?: string;
   logger?: string;
@@ -426,7 +426,7 @@ export interface llngConfig {
   oidcRPMetaDataExportedVars?: Record<string, Record<string, string>>;
   oidcRPMetaDataMacros?: Record<string, Record<string, string>>;
   oidcRPMetaDataNodes?: Record<string, object>;
-  oidcRPMetaDataOptions: Record<
+  oidcRPMetaDataOptions?: Record<
     string,
     Record<string, string | number | boolean>
   >;
@@ -788,7 +788,7 @@ export interface llngConfig {
   samlSPMetaDataOptionsSignSLOMessage?: number;
   samlSPMetaDataOptionsSignSSOMessage?: number;
   samlSPMetaDataOptionsSignatureMethod?: Array<{ k: string; v: string }>;
-  samlSPMetaDataXML: Record<string, Record<string, string>>;
+  samlSPMetaDataXML?: Record<string, Record<string, string>>;
   samlSPSSODescriptorArtifactResolutionServiceArtifact?: string;
   samlSPSSODescriptorAssertionConsumerServiceHTTPArtifact?: string;
   samlSPSSODescriptorAssertionConsumerServiceHTTPPost?: string;
@@ -921,7 +921,7 @@ export interface llngConfig {
   vhostDevOpsRulesUrl?: string;
   vhostHttps?: number;
   vhostMaintenance?: boolean | number;
-  vhostOptions: Record<string, Record<string, boolean | number | string>>;
+  vhostOptions?: Record<string, Record<string, boolean | number | string>>;
   vhostPort?: number;
   vhostServiceTokenTTL?: number;
   vhostType?: Array<{ k: string; v: string }>;