diff --git a/debug_contactpersoon_data.php b/debug_contactpersoon_data.php
new file mode 100644
index 00000000..215a58a5
--- /dev/null
+++ b/debug_contactpersoon_data.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Debug script to check what's in the database for the contactpersoon
+ */
+
+echo "=== DEBUG CONTACTPERSOON DATABASE DATA ===\n";
+
+// The contactpersoon ID from the API response
+$contactpersoonId = 'e8ba22ba-35ab-4b59-a097-91df6fa2cd3d';
+
+echo "Contactpersoon ID: $contactpersoonId\n\n";
+
+echo "1. Checking what's in the database for this contactpersoon...\n";
+echo "   - Query: SELECT * FROM oc_openregister_objects WHERE id = '$contactpersoonId'\n";
+echo "   - Expected fields: id, name, object (JSON), created, updated, etc.\n\n";
+
+echo "2. The 'object' field should contain JSON with:\n";
+echo "   - username: the Nextcloud username\n";
+echo "   - email: the email address\n";
+echo "   - other contactpersoon data\n\n";
+
+echo "3. If username is empty or null, the service returns:\n";
+echo "   - hasUser: false\n";
+echo "   - username: ''\n";
+echo "   - disabled: false (default for non-users)\n\n";
+
+echo "4. POSSIBLE ISSUES:\n";
+echo "   a) Username field is empty in database but user exists in Nextcloud\n";
+echo "   b) Username field has different format than expected\n";
+echo "   c) User was disabled but username was removed from contactpersoon data\n";
+echo "   d) There's a mismatch between what we think the username is vs what's stored\n\n";
+
+echo "5. TO FIX THIS:\n";
+echo "   a) Check the actual database record\n";
+echo "   b) Verify what username should be associated with this contactpersoon\n";
+echo "   c) Update the contactpersoon data with the correct username\n";
+echo "   d) Or fix the logic to handle this edge case\n\n";
+
+echo "=== END DEBUG ===\n";
+?>
diff --git a/debug_contactpersoon_database.php b/debug_contactpersoon_database.php
new file mode 100644
index 00000000..c0339d64
--- /dev/null
+++ b/debug_contactpersoon_database.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Debug script to check what's actually in the database for the contactpersoon
+ */
+
+echo "=== DEBUG CONTACTPERSOON DATABASE ===\n";
+
+// The contactpersoon ID from the API response
+$contactpersoonId = 'e8ba22ba-35ab-4b59-a097-91df6fa2cd3d';
+
+echo "Contactpersoon ID: $contactpersoonId\n\n";
+
+echo "1. We need to check what's actually in the database:\n";
+echo "   - Table: oc_openregister_objects\n";
+echo "   - Field: object (JSON)\n";
+echo "   - Should contain: username, email, etc.\n\n";
+
+echo "2. Current API response shows:\n";
+echo "   - hasUser: false\n";
+echo "   - username: ''\n";
+echo "   - disabled: false\n\n";
+
+echo "3. But user says this contactpersoon HAS a user!\n\n";
+
+echo "4. POSSIBLE CAUSES:\n";
+echo "   a) Username field is empty/null in database but user exists in Nextcloud\n";
+echo "   b) Username field has different name (not 'username')\n";
+echo "   c) Data structure is different than expected\n";
+echo "   d) Contactpersoon data was corrupted or not properly saved\n\n";
+
+echo "5. TO DEBUG:\n";
+echo "   a) Check the actual database record\n";
+echo "   b) Check if username is stored under a different field name\n";
+echo "   c) Check if the user exists in Nextcloud but isn't linked properly\n";
+echo "   d) Check if there's a mismatch between what we expect vs reality\n\n";
+
+echo "6. NEXT STEPS:\n";
+echo "   - Run a direct database query to see the raw data\n";
+echo "   - Check if username is stored differently\n";
+echo "   - Verify the user actually exists in Nextcloud\n";
+echo "   - Fix the data or the logic\n\n";
+
+echo "=== END DEBUG ===\n";
+?>
diff --git a/debug_database_direct.php b/debug_database_direct.php
new file mode 100644
index 00000000..aa354554
--- /dev/null
+++ b/debug_database_direct.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * Debug script to check database directly
+ * This script runs inside the Nextcloud container and checks the database directly
+ */
+
+require_once __DIR__ . '/../lib/base.php';
+
+echo "=== Direct Database Debug ===\n\n";
+
+// The contactpersoon ID from the user's example
+$contactpersoonId = 'e8ba22ba-35ab-4b59-a097-91df6fa2cd3d';
+
+echo "Looking for contactpersoon ID: " . $contactpersoonId . "\n\n";
+
+try {
+    // Get database connection
+    $connection = \OC::$server->getDatabaseConnection();
+    
+    // Query the openregister_objects table
+    $query = "SELECT * FROM oc_openregister_objects WHERE id = ?";
+    $stmt = $connection->prepare($query);
+    $result = $stmt->execute([$contactpersoonId]);
+    $row = $stmt->fetch();
+    
+    if ($row) {
+        echo "Found contactpersoon in database:\n";
+        echo "ID: " . $row['id'] . "\n";
+        echo "Name: " . $row['name'] . "\n";
+        echo "Object JSON: " . $row['object'] . "\n";
+        echo "Created: " . $row['created'] . "\n";
+        echo "Updated: " . $row['updated'] . "\n\n";
+        
+        // Decode the JSON object
+        $objectData = json_decode($row['object'], true);
+        if ($objectData) {
+            echo "Decoded object data:\n";
+            echo json_encode($objectData, JSON_PRETTY_PRINT) . "\n\n";
+            
+            // Check for username
+            if (isset($objectData['username'])) {
+                echo "Username found: " . $objectData['username'] . "\n";
+                
+                // Check if user exists in Nextcloud
+                $userManager = \OC::$server->getUserManager();
+                $user = $userManager->get($objectData['username']);
+                
+                if ($user) {
+                    echo "User exists in Nextcloud: " . $user->getUID() . "\n";
+                    echo "User enabled: " . ($user->isEnabled() ? 'Yes' : 'No') . "\n";
+                    echo "User disabled: " . ($user->isEnabled() ? 'No' : 'Yes') . "\n";
+                } else {
+                    echo "User NOT found in Nextcloud\n";
+                }
+            } else {
+                echo "No username field in object data\n";
+            }
+        } else {
+            echo "Failed to decode object JSON\n";
+        }
+    } else {
+        echo "Contactpersoon NOT found in database\n";
+    }
+    
+} catch (Exception $e) {
+    echo "Error: " . $e->getMessage() . "\n";
+    echo "Trace: " . $e->getTraceAsString() . "\n";
+}
+
+echo "\n=== Debug Complete ===\n";
diff --git a/debug_user_status.php b/debug_user_status.php
new file mode 100644
index 00000000..b137063c
--- /dev/null
+++ b/debug_user_status.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Debug script to check user status in Nextcloud
+ */
+
+// Get the contactpersoon ID from the API response
+$contactpersoonId = 'e8ba22ba-35ab-4b59-a097-91df6fa2cd3d';
+
+echo "=== DEBUG USER STATUS ===\n";
+echo "Contactpersoon ID: $contactpersoonId\n\n";
+
+// Simulate the ContactpersoonService logic
+try {
+    // This would be in the Docker container context
+    echo "1. Checking if contactpersoon exists in database...\n";
+    
+    // Simulate database query
+    echo "   - Would query openregister_objects table\n";
+    echo "   - Looking for contactpersoon with ID: $contactpersoonId\n\n";
+    
+    echo "2. Checking if contactpersoon has username...\n";
+    echo "   - Would check if data.username exists\n";
+    echo "   - Current API shows: hasUser: false, username: ''\n\n";
+    
+    echo "3. If no username, userInfo should be:\n";
+    echo "   - hasUser: false\n";
+    echo "   - username: ''\n";
+    echo "   - groups: []\n";
+    echo "   - disabled: false (default for non-users)\n\n";
+    
+    echo "4. ISSUE IDENTIFIED:\n";
+    echo "   - API returns disabled: false because hasUser: false\n";
+    echo "   - But user might actually be disabled in Nextcloud\n";
+    echo "   - We need to check if username exists but user is disabled\n\n";
+    
+    echo "5. POSSIBLE SOLUTIONS:\n";
+    echo "   a) Check if contactpersoon.data.username exists but user is disabled\n";
+    echo "   b) Verify the user was actually disabled via our disable endpoint\n";
+    echo "   c) Check if there's a mismatch between data.username and actual Nextcloud user\n\n";
+    
+} catch (Exception $e) {
+    echo "Error: " . $e->getMessage() . "\n";
+}
+
+echo "=== END DEBUG ===\n";
+?>
diff --git a/find_test_object.php b/find_test_object.php
deleted file mode 100644
index cdc71c31..00000000
--- a/find_test_object.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-require_once '/var/www/html/lib/base.php';
-
-$db = \OC::$server->getDatabaseConnection();
-
-try {
-    // Search for our specific test object
-    $query = $db->getQueryBuilder();
-    $query->select('*')
-          ->from('openregister_objects')
-          ->where($query->expr()->like('uuid', $query->createNamedParameter('%d4572e2e-aa3e-4cbe-94aa-16f0e2ae9620%')))
-          ->setMaxResults(1);
-    $result = $query->execute();
-    $row = $result->fetch();
-    
-    if ($row) {
-        echo "🎉 Found our test object!" . PHP_EOL;
-        echo "Database ID: " . $row['id'] . PHP_EOL;
-        echo "UUID: " . $row['uuid'] . PHP_EOL;
-        echo "Slug: " . ($row['slug'] ?: '(empty)') . PHP_EOL;
-        echo "Register: " . $row['register'] . PHP_EOL;
-        echo "Schema: " . $row['schema'] . PHP_EOL;
-        echo PHP_EOL;
-        
-        // Parse the JSON object
-        $obj = json_decode($row['object'], true);
-        if ($obj) {
-            echo "=== OBJECT STRUCTURE ANALYSIS ===" . PHP_EOL;
-            
-            // Check @self structure
-            if (isset($obj['@self'])) {
-                echo "✓ @self structure:" . PHP_EOL;
-                foreach ($obj['@self'] as $key => $value) {
-                    echo "  $key: " . $value . PHP_EOL;
-                }
-                echo PHP_EOL;
-            } else {
-                echo "❌ No @self structure found" . PHP_EOL;
-            }
-            
-            // Check for flattened properties
-            $expectedProps = ['GEMMA type', 'Object ID', 'GEMMA thema'];
-            echo "=== FLATTENED PROPERTIES CHECK ===" . PHP_EOL;
-            $foundProps = [];
-            foreach ($expectedProps as $prop) {
-                if (isset($obj[$prop])) {
-                    echo "✓ $prop: " . $obj[$prop] . PHP_EOL;
-                    $foundProps[] = $prop;
-                } else {
-                    echo "❌ $prop: NOT FOUND" . PHP_EOL;
-                }
-            }
-            echo PHP_EOL;
-            
-            // Check if properties are in xml field instead
-            if (isset($obj['xml']) && is_array($obj['xml'])) {
-                echo "=== PROPERTIES IN XML FIELD (SHOULD BE EMPTY) ===" . PHP_EOL;
-                $xmlProps = [];
-                foreach ($expectedProps as $prop) {
-                    if (isset($obj['xml'][$prop])) {
-                        echo "⚠️  $prop found in xml field: " . $obj['xml'][$prop] . PHP_EOL;
-                        $xmlProps[] = $prop;
-                    }
-                }
-                if (empty($xmlProps)) {
-                    echo "✓ No flattened properties found in xml field (good!)" . PHP_EOL;
-                }
-            }
-            
-            echo PHP_EOL . "=== SUMMARY ===" . PHP_EOL;
-            echo "Root level properties found: " . count($foundProps) . "/" . count($expectedProps) . PHP_EOL;
-            echo "Database slug field: " . ($row['slug'] ? "✓ " . $row['slug'] : "❌ EMPTY") . PHP_EOL;
-            echo "@self.slug: " . (isset($obj['@self']['slug']) ? "✓ " . $obj['@self']['slug'] : "❌ NOT SET") . PHP_EOL;
-        } else {
-            echo "❌ Failed to parse object JSON" . PHP_EOL;
-        }
-    } else {
-        echo "❌ Test object not found" . PHP_EOL;
-    }
-} catch (Exception $e) {
-    echo "Error: " . $e->getMessage() . PHP_EOL;
-}
-
diff --git a/src/components/cards/OrganisatieCard.vue b/src/components/cards/OrganisatieCard.vue
index 1cf1080d..9ffe531b 100644
--- a/src/components/cards/OrganisatieCard.vue
+++ b/src/components/cards/OrganisatieCard.vue
@@ -8,6 +8,7 @@
  * @license AGPL-3.0-or-later
  * @version 1.0.0
  * @link https://github.com/opencatalogi/softwarecatalog
+ * Updated: Fixed AlertTriangle import to use Alert icon
  */
 
 <template>
@@ -15,6 +16,11 @@
 		<div class="cardHeader">
 			<h2 v-tooltip.bottom="getOrganisatieSummary(item)">
 				<component :is="cardIcon" :size="20" />
+				<Alert 
+					v-if="!isOrganisatiePublished(item)"
+					v-tooltip="'Organisatie is niet gepubliceerd'"
+					class="unpublished-warning-icon"
+					:size="20" />
 				{{ getOrganisatieTitle(item) }}
 			</h2>
 			<div class="cardHeaderActions">
@@ -112,6 +118,7 @@
 			<!-- Contactpersonen View -->
 			<div v-else-if="currentView === 'contactpersonen'" class="contactpersonenView">
 				<ContactpersonenList 
+					ref="contactpersonenList"
 					:organisation-id="item.id || item.uuid" 
 					:organisation-data="item" />
 
@@ -146,6 +153,7 @@ import Email from 'vue-material-design-icons/Email.vue'
 import Phone from 'vue-material-design-icons/Phone.vue'
 import Certificate from 'vue-material-design-icons/Certificate.vue'
 import AccountMultiple from 'vue-material-design-icons/AccountMultiple.vue'
+import Alert from 'vue-material-design-icons/Alert.vue'
 import ContactpersonenList from '../ContactpersonenList.vue'
 
 export default {
@@ -160,6 +168,7 @@ export default {
 		Phone,
 		Certificate,
 		AccountMultiple,
+		Alert,
 		ContactpersonenList,
 	},
 	props: {
@@ -190,6 +199,32 @@ export default {
 			currentView: 'organisatie', // 'organisatie' or 'contactpersonen'
 		}
 	},
+
+	watch: {
+		/**
+		 * Watch for changes in currentView and refresh user data when switching to contactpersonen
+		 */
+		currentView: {
+			handler: async function(newView, oldView) {
+				// Only trigger when actually switching TO contactpersonen view from a different view
+				if (newView === 'contactpersonen' && oldView && oldView !== 'contactpersonen') {
+					console.log('Switched to contactpersonen view, loading user info and groups...')
+					// Use nextTick to ensure the component is fully rendered
+					await this.$nextTick()
+					if (this.$refs.contactpersonenList && this.$refs.contactpersonenList.loadUserInfoAndGroups) {
+						// Add a small delay to prevent rapid successive calls
+						setTimeout(async () => {
+							if (this.$refs.contactpersonenList && this.$refs.contactpersonenList.loadUserInfoAndGroups) {
+								await this.$refs.contactpersonenList.loadUserInfoAndGroups()
+							}
+						}, 100)
+					}
+				}
+			},
+			immediate: false
+		}
+	},
+
 	methods: {
 		/**
 		 * Get the display title for the organisation
@@ -251,8 +286,12 @@ export default {
 		/**
 		 * Toggle between organisation and contactpersonen views
 		 */
-		toggleView() {
-			this.currentView = this.currentView === 'organisatie' ? 'contactpersonen' : 'organisatie'
+		async toggleView() {
+			const newView = this.currentView === 'organisatie' ? 'contactpersonen' : 'organisatie'
+			this.currentView = newView
+			
+			// Note: The watch handler will handle refreshing user data when switching to contactpersonen view
+			// No need to duplicate the logic here
 		},
 
 		/**
@@ -284,6 +323,15 @@ export default {
 			
 			return 'Geen adres beschikbaar'
 		},
+
+		/**
+		 * Check if the organisation is published
+		 * @param {object} item - The organisation item
+		 * @return {boolean} True if published and not depublished, false otherwise
+		 */
+		isOrganisatiePublished(item) {
+			return !!(item?.['@self']?.published && !item?.['@self']?.depublished)
+		},
 	},
 }
 </script>
@@ -320,6 +368,11 @@ export default {
 	color: var(--color-main-text);
 }
 
+.unpublished-warning-icon {
+	color: #ff9800;
+	margin-right: 4px;
+}
+
 .cardHeaderActions {
 	display: flex;
 	gap: 8px;
diff --git a/src/views/organisaties/OrganisatieIndex.vue b/src/views/organisaties/OrganisatieIndex.vue
index 5ede6af2..473965d6 100644
--- a/src/views/organisaties/OrganisatieIndex.vue
+++ b/src/views/organisaties/OrganisatieIndex.vue
@@ -223,6 +223,24 @@ export default {
 						})
 					},
 				},
+				{
+					id: 'publish',
+					label: 'Publiceren',
+					icon: PublishIcon,
+					condition: (organisatie) => !organisatie['@self']?.published,
+					handler: (organisatie) => {
+						this.publishOrganisatie(organisatie)
+					},
+				},
+				{
+					id: 'depublish',
+					label: 'Depubliceren',
+					icon: PublishOffIcon,
+					condition: (organisatie) => organisatie['@self']?.published,
+					handler: (organisatie) => {
+						this.depublishOrganisatie(organisatie)
+					},
+				},
 				{
 					id: 'delete',
 					label: 'Delete',
@@ -349,7 +367,7 @@ export default {
 				// Fetch organisaties collection with contactpersonen extended
 				console.info('Fetching organisaties with contactpersonen...')
 				await objectStore.fetchCollection('organisatie', {
-					_extend: '@self.schema,contactpersonen',
+					_extend: '@self.schema,@self.register,contactpersonen',
 					_limit: 20,
 					_page: 1
 				})
@@ -534,6 +552,50 @@ export default {
 			this.selectedOrganisation = null
 			this.organisationModalMode = 'create'
 		},
+
+		/**
+		 * Publish an organisation
+		 * @param {object} organisatie - The organisation to publish
+		 * @return {Promise<void>}
+		 */
+		async publishOrganisatie(organisatie) {
+			try {
+				console.log('Publishing organisatie:', organisatie)
+				console.log('Organisatie @self:', organisatie['@self'])
+				console.log('Organisatie id:', organisatie.id)
+				console.log('Organisatie register:', organisatie['@self']?.register)
+				console.log('Organisatie schema:', organisatie['@self']?.schema)
+				
+				await objectStore.publishObject(organisatie)
+				// Refresh the organisation list to show updated status
+				await objectStore.fetchCollection('organisatie', {
+					_extend: '@self.schema,@self.register,contactpersonen',
+					_limit: 20,
+					_page: 1
+				})
+			} catch (error) {
+				console.error('Failed to publish organisation:', error)
+			}
+		},
+
+		/**
+		 * Depublish an organisation
+		 * @param {object} organisatie - The organisation to depublish
+		 * @return {Promise<void>}
+		 */
+		async depublishOrganisatie(organisatie) {
+			try {
+				await objectStore.depublishObject(organisatie)
+				// Refresh the organisation list to show updated status
+				await objectStore.fetchCollection('organisatie', {
+					_extend: '@self.schema,@self.register,contactpersonen',
+					_limit: 20,
+					_page: 1
+				})
+			} catch (error) {
+				console.error('Failed to depublish organisation:', error)
+			}
+		},
 	},
 
 	/**