diff --git a/css/main.css b/css/main.css
index 5adcff1e..a66067c7 100644
--- a/css/main.css
+++ b/css/main.css
@@ -673,6 +673,26 @@
   padding-left: 24px;
 }
 
+/* Table wrapper for modals to prevent expansion */
+.modal-table-wrapper {
+  max-width: 100%;
+  overflow-x: auto;
+  border-radius: var(--border-radius);
+  border: 1px solid var(--color-border);
+}
+
+.modal-table-wrapper .statisticsTable {
+  min-width: 300px;
+  margin: 0;
+}
+
+.modal-table-wrapper .statisticsTable td.truncatedText {
+  max-width: 200px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 /* Table styling variations */
 .tableOfContents thead th {
   background-color: var(--color-primary-light);
diff --git a/src/modals/Source/ViewSource.vue b/src/modals/Source/ViewSource.vue
index 3f2893e2..e3ca4cf5 100644
--- a/src/modals/Source/ViewSource.vue
+++ b/src/modals/Source/ViewSource.vue
@@ -14,55 +14,57 @@ import { sourceStore, navigationStore, logStore, synchronizationStore } from '..
 
 			<!-- Source Properties -->
 			<div class="source-properties">
-				<table class="statisticsTable sourceStats">
-					<thead>
-						<tr>
-							<th>{{ t('openconnector', 'Property') }}</th>
-							<th>{{ t('openconnector', 'Value') }}</th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr>
-							<td>{{ t('openconnector', 'Status') }}</td>
-							<td>{{ sourceStore.sourceItem?.status || 'Unknown' }}</td>
-						</tr>
-						<tr>
-							<td>{{ t('openconnector', 'Enabled') }}</td>
-							<td>{{ sourceStore.sourceItem?.isEnabled ? 'Enabled' : 'Disabled' }}</td>
-						</tr>
-						<tr>
-							<td>{{ t('openconnector', 'Type') }}</td>
-							<td>{{ sourceStore.sourceItem?.type || 'Unknown' }}</td>
-						</tr>
-						<tr v-if="sourceStore.sourceItem?.location">
-							<td>{{ t('openconnector', 'Location') }}</td>
-							<td class="truncatedUrl">
-								{{ sourceStore.sourceItem.location }}
-							</td>
-						</tr>
-						<tr v-if="sourceStore.sourceItem?.version">
-							<td>{{ t('openconnector', 'Version') }}</td>
-							<td>{{ sourceStore.sourceItem.version }}</td>
-						</tr>
+				<div class="modal-table-wrapper">
+					<table class="statisticsTable sourceStats">
+						<thead>
+							<tr>
+								<th>{{ t('openconnector', 'Property') }}</th>
+								<th>{{ t('openconnector', 'Value') }}</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr>
+								<td>{{ t('openconnector', 'Status') }}</td>
+								<td>{{ sourceStore.sourceItem?.status || 'Unknown' }}</td>
+							</tr>
+							<tr>
+								<td>{{ t('openconnector', 'Enabled') }}</td>
+								<td>{{ sourceStore.sourceItem?.isEnabled ? 'Enabled' : 'Disabled' }}</td>
+							</tr>
+							<tr>
+								<td>{{ t('openconnector', 'Type') }}</td>
+								<td>{{ sourceStore.sourceItem?.type || 'Unknown' }}</td>
+							</tr>
+							<tr v-if="sourceStore.sourceItem?.location">
+								<td>{{ t('openconnector', 'Location') }}</td>
+								<td class="truncatedUrl">
+									{{ sourceStore.sourceItem.location }}
+								</td>
+							</tr>
+							<tr v-if="sourceStore.sourceItem?.version">
+								<td>{{ t('openconnector', 'Version') }}</td>
+								<td>{{ sourceStore.sourceItem.version }}</td>
+							</tr>
 
-						<tr v-if="sourceStore.sourceItem?.lastCall">
-							<td>{{ t('openconnector', 'Last Call') }}</td>
-							<td>{{ new Date(sourceStore.sourceItem.lastCall).toLocaleDateString() + ', ' + new Date(sourceStore.sourceItem.lastCall).toLocaleTimeString() }}</td>
-						</tr>
-						<tr v-if="sourceStore.sourceItem?.lastSync">
-							<td>{{ t('openconnector', 'Last Sync') }}</td>
-							<td>{{ new Date(sourceStore.sourceItem.lastSync).toLocaleDateString() + ', ' + new Date(sourceStore.sourceItem.lastSync).toLocaleTimeString() }}</td>
-						</tr>
-						<tr>
-							<td>{{ t('openconnector', 'Created') }}</td>
-							<td>{{ sourceStore.sourceItem?.dateCreated ? new Date(sourceStore.sourceItem.dateCreated).toLocaleDateString() : '-' }}</td>
-						</tr>
-						<tr>
-							<td>{{ t('openconnector', 'Updated') }}</td>
-							<td>{{ sourceStore.sourceItem?.dateModified ? new Date(sourceStore.sourceItem.dateModified).toLocaleDateString() : '-' }}</td>
-						</tr>
-					</tbody>
-				</table>
+							<tr v-if="sourceStore.sourceItem?.lastCall">
+								<td>{{ t('openconnector', 'Last Call') }}</td>
+								<td>{{ new Date(sourceStore.sourceItem.lastCall).toLocaleDateString() + ', ' + new Date(sourceStore.sourceItem.lastCall).toLocaleTimeString() }}</td>
+							</tr>
+							<tr v-if="sourceStore.sourceItem?.lastSync">
+								<td>{{ t('openconnector', 'Last Sync') }}</td>
+								<td>{{ new Date(sourceStore.sourceItem.lastSync).toLocaleDateString() + ', ' + new Date(sourceStore.sourceItem.lastSync).toLocaleTimeString() }}</td>
+							</tr>
+							<tr>
+								<td>{{ t('openconnector', 'Created') }}</td>
+								<td>{{ sourceStore.sourceItem?.dateCreated ? new Date(sourceStore.sourceItem.dateCreated).toLocaleDateString() : '-' }}</td>
+							</tr>
+							<tr>
+								<td>{{ t('openconnector', 'Updated') }}</td>
+								<td>{{ sourceStore.sourceItem?.dateModified ? new Date(sourceStore.sourceItem.dateModified).toLocaleDateString() : '-' }}</td>
+							</tr>
+						</tbody>
+					</table>
+				</div>
 			</div>
 
 			<!-- Tabs -->
@@ -289,9 +291,9 @@ export default {
 			if (source.jwt) authData.JWT = source.jwt
 			if (source.secret) authData.Secret = source.secret
 			if (source.authorizationHeader) authData['Authorization Header'] = source.authorizationHeader
-			if (source.authenticationConfig && source.authenticationConfig.length > 0) {
-				source.authenticationConfig.forEach((config, index) => {
-					authData[`Auth Config ${index + 1}`] = typeof config === 'object' ? JSON.stringify(config) : config
+			if (source.configuration?.authentication && typeof source.configuration.authentication === 'object') {
+				Object.entries(source.configuration.authentication).forEach(([key, value]) => {
+					authData[key] = typeof value === 'object' ? JSON.stringify(value) : value
 				})
 			}
 
diff --git a/src/views/Source/SourcesIndex.vue b/src/views/Source/SourcesIndex.vue
index fa4b0bcd..6d2eb553 100644
--- a/src/views/Source/SourcesIndex.vue
+++ b/src/views/Source/SourcesIndex.vue
@@ -150,126 +150,130 @@
 								</p>
 								<!-- Toggle between stats, configurations, and authentication -->
 								<div v-if="!getSourceViewState(source).showConfigurations && !getSourceViewState(source).showAuthentication">
-									<table class="statisticsTable sourceStats">
-										<thead>
-											<tr>
-												<th>{{ t('openconnector', 'Property') }}</th>
-												<th>{{ t('openconnector', 'Value') }}</th>
-											</tr>
-										</thead>
-										<tbody>
-											<tr>
-												<td>{{ t('openconnector', 'Status') }}</td>
-												<td>{{ source.status || 'Unknown' }}</td>
-											</tr>
-											<tr>
-												<td>{{ t('openconnector', 'Enabled') }}</td>
-												<td>
-													{{ source.isEnabled ? 'Enabled' : 'Disabled' }}
-												</td>
-											</tr>
-											<tr>
-												<td>{{ t('openconnector', 'Type') }}</td>
-												<td>{{ source.type || 'Unknown' }}</td>
-											</tr>
-											<tr v-if="source.location">
-												<td>{{ t('openconnector', 'Location') }}</td>
-												<td class="truncatedUrl">
-													{{ source.location }}
-												</td>
-											</tr>
-											<tr v-if="source.version">
-												<td>{{ t('openconnector', 'Version') }}</td>
-												<td>{{ source.version }}</td>
-											</tr>
-											<tr>
-												<td>{{ t('openconnector', 'Configurations') }}</td>
-												<td style="display: flex; justify-content: space-between; align-items: center;">
-													<span>{{ getConfigurationCount(source) }}</span>
-													<NcButton @click="showSourceConfigurations(source)">
-														<template #icon>
-															<FileCogOutline :size="16" />
-														</template>
-														Show
-													</NcButton>
-												</td>
-											</tr>
-											<tr>
-												<td>{{ t('openconnector', 'Authentication') }}</td>
-												<td style="display: flex; justify-content: space-between; align-items: center;">
-													<span>{{ getAuthenticationCount(source) }}</span>
-													<NcButton @click="showSourceAuthentication(source)">
-														<template #icon>
-															<KeyOutline :size="16" />
-														</template>
-														Show
-													</NcButton>
-												</td>
-											</tr>
-											<tr v-if="source.lastCall">
-												<td>{{ t('openconnector', 'Last Call') }}</td>
-												<td>{{ new Date(source.lastCall).toLocaleDateString() + ', ' + new Date(source.lastCall).toLocaleTimeString() }}</td>
-											</tr>
-											<tr v-if="source.lastSync">
-												<td>{{ t('openconnector', 'Last Sync') }}</td>
-												<td>{{ new Date(source.lastSync).toLocaleDateString() + ', ' + new Date(source.lastSync).toLocaleTimeString() }}</td>
-											</tr>
-											<tr>
-												<td>{{ t('openconnector', 'Created') }}</td>
-												<td>{{ source.dateCreated ? new Date(source.dateCreated).toLocaleDateString() : '-' }}</td>
-											</tr>
-											<tr>
-												<td>{{ t('openconnector', 'Updated') }}</td>
-												<td>{{ source.dateModified ? new Date(source.dateModified).toLocaleDateString() : '-' }}</td>
-											</tr>
-										</tbody>
-									</table>
-								</div>
-								<!-- Configurations view -->
-								<div v-else-if="getSourceViewState(source).showConfigurations" style="display: flex; flex-direction: column; height: 100%;">
-									<div style="flex: 1;">
+									<div class="modal-table-wrapper">
 										<table class="statisticsTable sourceStats">
 											<thead>
 												<tr>
-													<th>{{ t('openconnector', 'Key') }}</th>
+													<th>{{ t('openconnector', 'Property') }}</th>
 													<th>{{ t('openconnector', 'Value') }}</th>
-													<th>{{ t('openconnector', 'Actions') }}</th>
 												</tr>
 											</thead>
 											<tbody>
-												<tr v-for="(value, key) in source.configuration" :key="key">
-													<td>{{ key }}</td>
-													<td class="truncatedText">
-														{{ value }}
-													</td>
+												<tr>
+													<td>{{ t('openconnector', 'Status') }}</td>
+													<td>{{ source.status || 'Unknown' }}</td>
+												</tr>
+												<tr>
+													<td>{{ t('openconnector', 'Enabled') }}</td>
 													<td>
-														<NcActions :primary="false">
+														{{ source.isEnabled ? 'Enabled' : 'Disabled' }}
+													</td>
+												</tr>
+												<tr>
+													<td>{{ t('openconnector', 'Type') }}</td>
+													<td>{{ source.type || 'Unknown' }}</td>
+												</tr>
+												<tr v-if="source.location">
+													<td>{{ t('openconnector', 'Location') }}</td>
+													<td class="truncatedUrl">
+														{{ source.location }}
+													</td>
+												</tr>
+												<tr v-if="source.version">
+													<td>{{ t('openconnector', 'Version') }}</td>
+													<td>{{ source.version }}</td>
+												</tr>
+												<tr>
+													<td>{{ t('openconnector', 'Configurations') }}</td>
+													<td style="display: flex; justify-content: space-between; align-items: center;">
+														<span>{{ getConfigurationCount(source) }}</span>
+														<NcButton @click="showSourceConfigurations(source)">
 															<template #icon>
-																<DotsHorizontal :size="16" />
+																<FileCogOutline :size="16" />
 															</template>
-															<NcActionButton close-after-click @click="editSourceConfiguration(source, key)">
-																<template #icon>
-																	<Pencil :size="16" />
-																</template>
-																Edit
-															</NcActionButton>
-															<NcActionButton close-after-click @click="deleteSourceConfiguration(source, key)">
-																<template #icon>
-																	<TrashCanOutline :size="16" />
-																</template>
-																Delete
-															</NcActionButton>
-														</NcActions>
+															Show
+														</NcButton>
 													</td>
 												</tr>
-												<tr v-if="!source.configuration || !Object.keys(source.configuration).length">
-													<td colspan="3">
-														{{ t('openconnector', 'No configurations found') }}
+												<tr>
+													<td>{{ t('openconnector', 'Authentication') }}</td>
+													<td style="display: flex; justify-content: space-between; align-items: center;">
+														<span>{{ getAuthenticationCount(source) }}</span>
+														<NcButton @click="showSourceAuthentication(source)">
+															<template #icon>
+																<KeyOutline :size="16" />
+															</template>
+															Show
+														</NcButton>
 													</td>
 												</tr>
+												<tr v-if="source.lastCall">
+													<td>{{ t('openconnector', 'Last Call') }}</td>
+													<td>{{ new Date(source.lastCall).toLocaleDateString() + ', ' + new Date(source.lastCall).toLocaleTimeString() }}</td>
+												</tr>
+												<tr v-if="source.lastSync">
+													<td>{{ t('openconnector', 'Last Sync') }}</td>
+													<td>{{ new Date(source.lastSync).toLocaleDateString() + ', ' + new Date(source.lastSync).toLocaleTimeString() }}</td>
+												</tr>
+												<tr>
+													<td>{{ t('openconnector', 'Created') }}</td>
+													<td>{{ source.dateCreated ? new Date(source.dateCreated).toLocaleDateString() : '-' }}</td>
+												</tr>
+												<tr>
+													<td>{{ t('openconnector', 'Updated') }}</td>
+													<td>{{ source.dateModified ? new Date(source.dateModified).toLocaleDateString() : '-' }}</td>
+												</tr>
 											</tbody>
 										</table>
 									</div>
+								</div>
+								<!-- Configurations view -->
+								<div v-else-if="getSourceViewState(source).showConfigurations" style="display: flex; flex-direction: column; height: 100%;">
+									<div style="flex: 1;">
+										<div class="modal-table-wrapper">
+											<table class="statisticsTable sourceStats">
+												<thead>
+													<tr>
+														<th>{{ t('openconnector', 'Key') }}</th>
+														<th>{{ t('openconnector', 'Value') }}</th>
+														<th>{{ t('openconnector', 'Actions') }}</th>
+													</tr>
+												</thead>
+												<tbody>
+													<tr v-for="(value, key) in filteredConfiguration(source)" :key="key">
+														<td>{{ key }}</td>
+														<td class="truncatedText">
+															{{ value }}
+														</td>
+														<td>
+															<NcActions :primary="false">
+																<template #icon>
+																	<DotsHorizontal :size="16" />
+																</template>
+																<NcActionButton close-after-click @click="editSourceConfiguration(source, key)">
+																	<template #icon>
+																		<Pencil :size="16" />
+																	</template>
+																	Edit
+																</NcActionButton>
+																<NcActionButton close-after-click @click="deleteSourceConfiguration(source, key)">
+																	<template #icon>
+																		<TrashCanOutline :size="16" />
+																	</template>
+																	Delete
+																</NcActionButton>
+															</NcActions>
+														</td>
+													</tr>
+													<tr v-if="!source.configuration || !Object.keys(source.configuration).length">
+														<td colspan="3">
+															{{ t('openconnector', 'No configurations found') }}
+														</td>
+													</tr>
+												</tbody>
+											</table>
+										</div>
+									</div>
 									<div style="display: flex; justify-content: flex-end; align-items: center; gap: 8px; margin-top: auto; padding-top: 10px;">
 										<NcButton @click="showSourceStats(source)">
 											<template #icon>
@@ -289,193 +293,195 @@
 								<!-- Authentication view -->
 								<div v-else-if="getSourceViewState(source).showAuthentication" style="display: flex; flex-direction: column; height: 100%;">
 									<div style="flex: 1;">
-										<table class="statisticsTable sourceStats">
-											<thead>
-												<tr>
-													<th>{{ t('openconnector', 'Property') }}</th>
-													<th>{{ t('openconnector', 'Value') }}</th>
-													<th>{{ t('openconnector', 'Actions') }}</th>
-												</tr>
-											</thead>
-											<tbody>
-												<tr v-if="source.auth">
-													<td>{{ t('openconnector', 'Auth Type') }}</td>
-													<td>{{ source.auth }}</td>
-													<td>
-														<NcActions :primary="false">
-															<template #icon>
-																<DotsHorizontal :size="16" />
-															</template>
-															<NcActionButton close-after-click @click="editSourceAuthentication(source, 'auth')">
-																<template #icon>
-																	<Pencil :size="16" />
-																</template>
-																Edit
-															</NcActionButton>
-															<NcActionButton close-after-click @click="deleteSourceAuthentication(source, 'auth')">
-																<template #icon>
-																	<TrashCanOutline :size="16" />
-																</template>
-																Delete
-															</NcActionButton>
-														</NcActions>
-													</td>
-												</tr>
-												<tr v-if="source.username">
-													<td>{{ t('openconnector', 'Username') }}</td>
-													<td>{{ source.username }}</td>
-													<td>
-														<NcActions :primary="false">
-															<template #icon>
-																<DotsHorizontal :size="16" />
-															</template>
-															<NcActionButton close-after-click @click="editSourceAuthentication(source, 'username')">
+										<div class="modal-table-wrapper">
+											<table class="statisticsTable sourceStats">
+												<thead>
+													<tr>
+														<th>{{ t('openconnector', 'Property') }}</th>
+														<th>{{ t('openconnector', 'Value') }}</th>
+														<th>{{ t('openconnector', 'Actions') }}</th>
+													</tr>
+												</thead>
+												<tbody>
+													<tr v-if="source.auth">
+														<td>{{ t('openconnector', 'Auth Type') }}</td>
+														<td>{{ source.auth }}</td>
+														<td>
+															<NcActions :primary="false">
 																<template #icon>
-																	<Pencil :size="16" />
+																	<DotsHorizontal :size="16" />
 																</template>
-																Edit
-															</NcActionButton>
-															<NcActionButton close-after-click @click="deleteSourceAuthentication(source, 'username')">
+																<NcActionButton close-after-click @click="editSourceAuthentication(source, 'auth')">
+																	<template #icon>
+																		<Pencil :size="16" />
+																	</template>
+																	Edit
+																</NcActionButton>
+																<NcActionButton close-after-click @click="deleteSourceAuthentication(source, 'auth')">
+																	<template #icon>
+																		<TrashCanOutline :size="16" />
+																	</template>
+																	Delete
+																</NcActionButton>
+															</NcActions>
+														</td>
+													</tr>
+													<tr v-if="source.username">
+														<td>{{ t('openconnector', 'Username') }}</td>
+														<td>{{ source.username }}</td>
+														<td>
+															<NcActions :primary="false">
 																<template #icon>
-																	<TrashCanOutline :size="16" />
+																	<DotsHorizontal :size="16" />
 																</template>
-																Delete
-															</NcActionButton>
-														</NcActions>
-													</td>
-												</tr>
-												<tr v-if="source.apikey">
-													<td>{{ t('openconnector', 'API Key') }}</td>
-													<td class="truncatedText">
-														{{ source.apikey }}
-													</td>
-													<td>
-														<NcActions :primary="false">
-															<template #icon>
-																<DotsHorizontal :size="16" />
-															</template>
-															<NcActionButton close-after-click @click="editSourceAuthentication(source, 'apikey')">
+																<NcActionButton close-after-click @click="editSourceAuthentication(source, 'username')">
+																	<template #icon>
+																		<Pencil :size="16" />
+																	</template>
+																	Edit
+																</NcActionButton>
+																<NcActionButton close-after-click @click="deleteSourceAuthentication(source, 'username')">
+																	<template #icon>
+																		<TrashCanOutline :size="16" />
+																	</template>
+																	Delete
+																</NcActionButton>
+															</NcActions>
+														</td>
+													</tr>
+													<tr v-if="source.apikey">
+														<td>{{ t('openconnector', 'API Key') }}</td>
+														<td class="truncatedText">
+															{{ source.apikey }}
+														</td>
+														<td>
+															<NcActions :primary="false">
 																<template #icon>
-																	<Pencil :size="16" />
+																	<DotsHorizontal :size="16" />
 																</template>
-																Edit
-															</NcActionButton>
-															<NcActionButton close-after-click @click="deleteSourceAuthentication(source, 'apikey')">
+																<NcActionButton close-after-click @click="editSourceAuthentication(source, 'apikey')">
+																	<template #icon>
+																		<Pencil :size="16" />
+																	</template>
+																	Edit
+																</NcActionButton>
+																<NcActionButton close-after-click @click="deleteSourceAuthentication(source, 'apikey')">
+																	<template #icon>
+																		<TrashCanOutline :size="16" />
+																	</template>
+																	Delete
+																</NcActionButton>
+															</NcActions>
+														</td>
+													</tr>
+													<tr v-if="source.jwt">
+														<td>{{ t('openconnector', 'JWT') }}</td>
+														<td class="truncatedText">
+															{{ source.jwt }}
+														</td>
+														<td>
+															<NcActions :primary="false">
 																<template #icon>
-																	<TrashCanOutline :size="16" />
+																	<DotsHorizontal :size="16" />
 																</template>
-																Delete
-															</NcActionButton>
-														</NcActions>
-													</td>
-												</tr>
-												<tr v-if="source.jwt">
-													<td>{{ t('openconnector', 'JWT') }}</td>
-													<td class="truncatedText">
-														{{ source.jwt }}
-													</td>
-													<td>
-														<NcActions :primary="false">
-															<template #icon>
-																<DotsHorizontal :size="16" />
-															</template>
-															<NcActionButton close-after-click @click="editSourceAuthentication(source, 'jwt')">
+																<NcActionButton close-after-click @click="editSourceAuthentication(source, 'jwt')">
+																	<template #icon>
+																		<Pencil :size="16" />
+																	</template>
+																	Edit
+																</NcActionButton>
+																<NcActionButton close-after-click @click="deleteSourceAuthentication(source, 'jwt')">
+																	<template #icon>
+																		<TrashCanOutline :size="16" />
+																	</template>
+																	Delete
+																</NcActionButton>
+															</NcActions>
+														</td>
+													</tr>
+													<tr v-if="source.secret">
+														<td>{{ t('openconnector', 'Secret') }}</td>
+														<td class="truncatedText">
+															{{ source.secret }}
+														</td>
+														<td>
+															<NcActions :primary="false">
 																<template #icon>
-																	<Pencil :size="16" />
+																	<DotsHorizontal :size="16" />
 																</template>
-																Edit
-															</NcActionButton>
-															<NcActionButton close-after-click @click="deleteSourceAuthentication(source, 'jwt')">
+																<NcActionButton close-after-click @click="editSourceAuthentication(source, 'secret')">
+																	<template #icon>
+																		<Pencil :size="16" />
+																	</template>
+																	Edit
+																</NcActionButton>
+																<NcActionButton close-after-click @click="deleteSourceAuthentication(source, 'secret')">
+																	<template #icon>
+																		<TrashCanOutline :size="16" />
+																	</template>
+																	Delete
+																</NcActionButton>
+															</NcActions>
+														</td>
+													</tr>
+													<tr v-if="source.authorizationHeader">
+														<td>{{ t('openconnector', 'Authorization Header') }}</td>
+														<td class="truncatedText">
+															{{ source.authorizationHeader }}
+														</td>
+														<td>
+															<NcActions :primary="false">
 																<template #icon>
-																	<TrashCanOutline :size="16" />
+																	<DotsHorizontal :size="16" />
 																</template>
-																Delete
-															</NcActionButton>
-														</NcActions>
-													</td>
-												</tr>
-												<tr v-if="source.secret">
-													<td>{{ t('openconnector', 'Secret') }}</td>
-													<td class="truncatedText">
-														{{ source.secret }}
-													</td>
-													<td>
-														<NcActions :primary="false">
-															<template #icon>
-																<DotsHorizontal :size="16" />
-															</template>
-															<NcActionButton close-after-click @click="editSourceAuthentication(source, 'secret')">
-																<template #icon>
-																	<Pencil :size="16" />
-																</template>
-																Edit
-															</NcActionButton>
-															<NcActionButton close-after-click @click="deleteSourceAuthentication(source, 'secret')">
+																<NcActionButton close-after-click @click="editSourceAuthentication(source, 'authorizationHeader')">
+																	<template #icon>
+																		<Pencil :size="16" />
+																	</template>
+																	Edit
+																</NcActionButton>
+																<NcActionButton close-after-click @click="deleteSourceAuthentication(source, 'authorizationHeader')">
+																	<template #icon>
+																		<TrashCanOutline :size="16" />
+																	</template>
+																	Delete
+																</NcActionButton>
+															</NcActions>
+														</td>
+													</tr>
+													<tr v-for="(config, index) in source.configuration.authentication" :key="`auth-${index}`">
+														<td>{{ t('openconnector', 'Auth Config {index}', { index: index + 1 }) }}</td>
+														<td class="truncatedText">
+															{{ typeof config === 'object' ? JSON.stringify(config) : config }}
+														</td>
+														<td>
+															<NcActions :primary="false">
 																<template #icon>
-																	<TrashCanOutline :size="16" />
+																	<DotsHorizontal :size="16" />
 																</template>
-																Delete
-															</NcActionButton>
-														</NcActions>
-													</td>
-												</tr>
-												<tr v-if="source.authorizationHeader">
-													<td>{{ t('openconnector', 'Authorization Header') }}</td>
-													<td class="truncatedText">
-														{{ source.authorizationHeader }}
-													</td>
-													<td>
-														<NcActions :primary="false">
-															<template #icon>
-																<DotsHorizontal :size="16" />
-															</template>
-															<NcActionButton close-after-click @click="editSourceAuthentication(source, 'authorizationHeader')">
-																<template #icon>
-																	<Pencil :size="16" />
-																</template>
-																Edit
-															</NcActionButton>
-															<NcActionButton close-after-click @click="deleteSourceAuthentication(source, 'authorizationHeader')">
-																<template #icon>
-																	<TrashCanOutline :size="16" />
-																</template>
-																Delete
-															</NcActionButton>
-														</NcActions>
-													</td>
-												</tr>
-												<tr v-for="(config, index) in source.authenticationConfig" :key="`auth-${index}`">
-													<td>{{ t('openconnector', 'Auth Config {index}', { index: index + 1 }) }}</td>
-													<td class="truncatedText">
-														{{ typeof config === 'object' ? JSON.stringify(config) : config }}
-													</td>
-													<td>
-														<NcActions :primary="false">
-															<template #icon>
-																<DotsHorizontal :size="16" />
-															</template>
-															<NcActionButton close-after-click @click="editSourceAuthentication(source, `authenticationConfig.${index}`)">
-																<template #icon>
-																	<Pencil :size="16" />
-																</template>
-																Edit
-															</NcActionButton>
-															<NcActionButton close-after-click @click="deleteSourceAuthentication(source, `authenticationConfig.${index}`)">
-																<template #icon>
-																	<TrashCanOutline :size="16" />
-																</template>
-																Delete
-															</NcActionButton>
-														</NcActions>
-													</td>
-												</tr>
-												<tr v-if="!hasAuthenticationData(source)">
-													<td colspan="3">
-														{{ t('openconnector', 'No authentication configured') }}
-													</td>
-												</tr>
-											</tbody>
-										</table>
+																<NcActionButton close-after-click @click="editSourceAuthentication(source, `authenticationConfig.${index}`)">
+																	<template #icon>
+																		<Pencil :size="16" />
+																	</template>
+																	Edit
+																</NcActionButton>
+																<NcActionButton close-after-click @click="deleteSourceAuthentication(source, `authenticationConfig.${index}`)">
+																	<template #icon>
+																		<TrashCanOutline :size="16" />
+																	</template>
+																	Delete
+																</NcActionButton>
+															</NcActions>
+														</td>
+													</tr>
+													<tr v-if="!hasAuthenticationData(source)">
+														<td colspan="3">
+															{{ t('openconnector', 'No authentication configured') }}
+														</td>
+													</tr>
+												</tbody>
+											</table>
+										</div>
 									</div>
 									<div style="display: flex; justify-content: flex-end; align-items: center; gap: 8px; margin-top: auto; padding-top: 10px;">
 										<NcButton @click="showSourceStats(source)">
@@ -713,6 +719,10 @@ export default {
 		this.sourceStore.refreshSourceList()
 	},
 	methods: {
+		filteredConfiguration(source) {
+			const { authentication, ...configWithoutAuth } = source.configuration || {}
+			return configWithoutAuth
+		},
 		setViewMode(mode) {
 			if (mode === 'cards' || mode === 'table') {
 				this.sourceStore.setViewMode(mode)
@@ -752,8 +762,8 @@ export default {
 			if (source.jwt) count++
 			if (source.secret) count++
 			if (source.authorizationHeader) count++
-			if (source.authenticationConfig && source.authenticationConfig.length > 0) {
-				count += source.authenticationConfig.length
+			if (source.configuration.authentication && Object.keys(source.configuration.authentication).length > 0) {
+				count += Object.keys(source.configuration.authentication).length
 			}
 			return count
 		},
@@ -775,7 +785,7 @@ export default {
 		hasAuthenticationData(source) {
 			return !!(source.auth || source.username || source.apikey || source.jwt
 				|| source.secret || source.authorizationHeader
-				|| (source.authenticationConfig && source.authenticationConfig.length > 0))
+				|| (source.configuration.authentication && Object.keys(source.configuration.authentication).length > 0))
 		},
 
 		/**