diff --git a/src/features/app_start/vip/congregation_create/congregation_access_code/useCongregationAccessCode.tsx b/src/features/app_start/vip/congregation_create/congregation_access_code/useCongregationAccessCode.tsx
index 221d7d1482..6dcfa773e3 100644
--- a/src/features/app_start/vip/congregation_create/congregation_access_code/useCongregationAccessCode.tsx
+++ b/src/features/app_start/vip/congregation_create/congregation_access_code/useCongregationAccessCode.tsx
@@ -49,7 +49,7 @@ const useCongregationAccessCode = () => {
 
       if (status !== 200) {
         await displayOnboardingFeedback({
-          title: t('tr_errorGeneric'),
+          title: t('error_app_generic-title'),
           message: getMessageByCode(data.message),
         });
         showMessage();
@@ -70,7 +70,7 @@ const useCongregationAccessCode = () => {
       }, 1000);
     } catch (err) {
       await displayOnboardingFeedback({
-        title: t('tr_errorGeneric'),
+        title: t('error_app_generic-title'),
         message: getMessageByCode(err.message),
       });
       showMessage();
diff --git a/src/features/app_start/vip/congregation_create/congregation_details/useCongregationDetails.tsx b/src/features/app_start/vip/congregation_create/congregation_details/useCongregationDetails.tsx
index 986e0ebc9f..aa0f6e2218 100644
--- a/src/features/app_start/vip/congregation_create/congregation_details/useCongregationDetails.tsx
+++ b/src/features/app_start/vip/congregation_create/congregation_details/useCongregationDetails.tsx
@@ -76,7 +76,7 @@ const useCongregationDetails = () => {
 
       if (status !== 200 && status !== 404) {
         await displayOnboardingFeedback({
-          title: t('tr_errorGeneric'),
+          title: t('error_app_generic-title'),
           message: getMessageByCode(data.message),
         });
         showMessage();
@@ -87,7 +87,7 @@ const useCongregationDetails = () => {
 
       if (status === 404) {
         await displayOnboardingFeedback({
-          title: t('tr_errorGeneric'),
+          title: t('error_app_generic-title'),
           message: t('tr_congregationExists'),
         });
         showMessage();
@@ -149,7 +149,7 @@ const useCongregationDetails = () => {
       console.error(err);
 
       await displayOnboardingFeedback({
-        title: t('tr_errorGeneric'),
+        title: t('error_app_generic-title'),
         message: getMessageByCode(err.message),
       });
       showMessage();
diff --git a/src/features/app_start/vip/congregation_create/congregation_master_key/useCongregationMasterKey.tsx b/src/features/app_start/vip/congregation_create/congregation_master_key/useCongregationMasterKey.tsx
index 500f2b8e0f..e602089a28 100644
--- a/src/features/app_start/vip/congregation_create/congregation_master_key/useCongregationMasterKey.tsx
+++ b/src/features/app_start/vip/congregation_create/congregation_master_key/useCongregationMasterKey.tsx
@@ -47,7 +47,7 @@ const useCongregationMasterKey = () => {
 
       if (status !== 200) {
         await displayOnboardingFeedback({
-          title: t('tr_errorGeneric'),
+          title: t('error_app_generic-title'),
           message: getMessageByCode(data.message),
         });
         showMessage();
@@ -63,7 +63,7 @@ const useCongregationMasterKey = () => {
       setCurrentStep(2);
     } catch (err) {
       await displayOnboardingFeedback({
-        title: t('tr_errorGeneric'),
+        title: t('error_app_generic-title'),
         message: getMessageByCode(err.message),
       });
       showMessage();
diff --git a/src/features/app_start/vip/congregation_encryption/congregation_access_code/useCongregationAccessCode.tsx b/src/features/app_start/vip/congregation_encryption/congregation_access_code/useCongregationAccessCode.tsx
index 5a7593e1cd..befc5a8b53 100644
--- a/src/features/app_start/vip/congregation_encryption/congregation_access_code/useCongregationAccessCode.tsx
+++ b/src/features/app_start/vip/congregation_encryption/congregation_access_code/useCongregationAccessCode.tsx
@@ -53,7 +53,7 @@ const useCongregationAccessCode = () => {
     } catch (err) {
       console.error(err);
       await displayOnboardingFeedback({
-        title: t('tr_errorGeneric'),
+        title: t('error_app_generic-title'),
         message: t('tr_encryptionCodeInvalid'),
       });
       showMessage();
diff --git a/src/features/app_start/vip/congregation_encryption/congregation_master_key/useCongregationMasterKey.tsx b/src/features/app_start/vip/congregation_encryption/congregation_master_key/useCongregationMasterKey.tsx
index 94e73986de..6f0938d881 100644
--- a/src/features/app_start/vip/congregation_encryption/congregation_master_key/useCongregationMasterKey.tsx
+++ b/src/features/app_start/vip/congregation_encryption/congregation_master_key/useCongregationMasterKey.tsx
@@ -42,7 +42,7 @@ const useCongregationMasterKey = () => {
     } catch (err) {
       console.error(err);
       await displayOnboardingFeedback({
-        title: t('tr_errorGeneric'),
+        title: t('error_app_generic-title'),
         message: t('tr_encryptionCodeInvalid'),
       });
       showMessage();
diff --git a/src/features/app_start/vip/email_auth/useEmailAuth.tsx b/src/features/app_start/vip/email_auth/useEmailAuth.tsx
index b8dc2b8ceb..10fd74783a 100644
--- a/src/features/app_start/vip/email_auth/useEmailAuth.tsx
+++ b/src/features/app_start/vip/email_auth/useEmailAuth.tsx
@@ -34,7 +34,7 @@ const useEmailAuth = () => {
 
     if (!isEmailValid(userTmpEmail)) {
       await displayOnboardingFeedback({
-        title: t('tr_errorGeneric'),
+        title: t('error_app_generic-title'),
         message: t('tr_emailNotSupported'),
       });
       showMessage();
@@ -47,7 +47,7 @@ const useEmailAuth = () => {
 
     if (status !== 200) {
       await displayOnboardingFeedback({
-        title: t('tr_errorGeneric'),
+        title: t('error_app_generic-title'),
         message: getMessageByCode(data.message),
       });
       showMessage();
diff --git a/src/features/app_start/vip/email_link_authentication/useEmailLinkAuth.tsx b/src/features/app_start/vip/email_link_authentication/useEmailLinkAuth.tsx
index f3d15811b4..44967e6687 100644
--- a/src/features/app_start/vip/email_link_authentication/useEmailLinkAuth.tsx
+++ b/src/features/app_start/vip/email_link_authentication/useEmailLinkAuth.tsx
@@ -139,7 +139,7 @@ const useEmailLinkAuth = () => {
 
       if (status !== 200) {
         await displayOnboardingFeedback({
-          title: t('tr_errorGeneric'),
+          title: t('error_app_generic-title'),
           message: getMessageByCode(data.message),
         });
         showMessage();
@@ -183,7 +183,7 @@ const useEmailLinkAuth = () => {
       console.error(err);
 
       await displayOnboardingFeedback({
-        title: t('tr_errorGeneric'),
+        title: t('error_app_generic-title'),
         message: getMessageByCode(err.message),
       });
       showMessage();
diff --git a/src/features/app_start/vip/oauth/button_base/useButtonBase.tsx b/src/features/app_start/vip/oauth/button_base/useButtonBase.tsx
index 9809af19ea..92ec80ca49 100644
--- a/src/features/app_start/vip/oauth/button_base/useButtonBase.tsx
+++ b/src/features/app_start/vip/oauth/button_base/useButtonBase.tsx
@@ -206,7 +206,9 @@ const useButtonBase = ({ provider, isEmail }) => {
       setIsAuthProcessing(false);
     } catch (error) {
       console.error(error);
-      await handleAuthorizationError(error.code || t('tr_errorGeneric'));
+      await handleAuthorizationError(
+        error.code || error.message || t('error_app_generic-desc')
+      );
     }
   };
 
diff --git a/src/features/app_start/vip/verify_mfa/useVerifyMFA.tsx b/src/features/app_start/vip/verify_mfa/useVerifyMFA.tsx
index d09463d13e..3488824023 100644
--- a/src/features/app_start/vip/verify_mfa/useVerifyMFA.tsx
+++ b/src/features/app_start/vip/verify_mfa/useVerifyMFA.tsx
@@ -153,7 +153,7 @@ const useVerifyMFA = () => {
       console.error(error);
 
       await displayOnboardingFeedback({
-        title: t('tr_errorGeneric'),
+        title: t('error_app_generic-title'),
         message: getMessageByCode(error.message),
       });