diff --git a/src/components/ContentComponents/Konnector/KonnectorLaunch.tsx b/src/components/ContentComponents/Konnector/KonnectorLaunch.tsx
index 4d8a9ca20a199b0ac29b08bd6c28a2858dfe6bd3..b74aa5ca196cafef40f7d40d3c898944edac99ad 100644
--- a/src/components/ContentComponents/Konnector/KonnectorLaunch.tsx
+++ b/src/components/ContentComponents/Konnector/KonnectorLaunch.tsx
@@ -48,11 +48,8 @@ const KonnectorLaunch: React.FC<KonnectorLaunchProps> = ({
     setState(_state)
   }
 
-  const handleClick = () => {
-    handleKonnectorLaunch()
-  }
-
   const handleCloseClick = () => {
+    handleKonnectorLaunch()
     setOpenModal(false)
   }
 
@@ -113,7 +110,11 @@ const KonnectorLaunch: React.FC<KonnectorLaunchProps> = ({
                   {t('KONNECTORCONFIG.SUCCESS_DATA')}
                 </div>
               )}
-              <StyledButton type="button" color="primary" onClick={handleClick}>
+              <StyledButton
+                type="button"
+                color="primary"
+                onClick={handleCloseClick}
+              >
                 <div>{t('KONNECTORCONFIG.OK')}</div>
               </StyledButton>
             </div>
diff --git a/src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx b/src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx
index 8ea145a2b6b44152e929e640653828e89e62aebd..0f40480ba35c2b79571368924a62d3b0eee63dc5 100644
--- a/src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx
+++ b/src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx
@@ -61,7 +61,9 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({
   const loginFailed: boolean =
     triggerState != null &&
     triggerState.last_error != undefined &&
-    triggerState.last_error === 'LOGIN_FAILED'
+    triggerState.last_error === 'LOGIN_FAILED' &&
+    triggerState.status != undefined &&
+    triggerState.status === 'errored'
 
   const toggleAccordion = () => {
     setActiveState(setActive === '' ? 'active' : '')
@@ -85,6 +87,7 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({
 
   const updateState = async (trigger: Trigger) => {
     const triggerState = await TriggerService.fetchTriggerState(client, trigger)
+    console.log('triggerState', triggerState)
     if (triggerState) {
       setTriggerState(triggerState)
     }
@@ -168,6 +171,7 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({
               style={{ maxHeight: `${setHeight}` }}
               className={`accordion-content ${setActive}`}
             >
+              {console.log('loginFailed', loginFailed)}
               {!konnector ? (
                 <KonnectorNotFound
                   konnectorSlug={fluidConfig.konnectorConfig.slug}