diff --git a/b0esche_cloud/lib/widgets/account_settings_dialog.dart b/b0esche_cloud/lib/widgets/account_settings_dialog.dart
index 68cae38..86eedf5 100644
--- a/b0esche_cloud/lib/widgets/account_settings_dialog.dart
+++ b/b0esche_cloud/lib/widgets/account_settings_dialog.dart
@@ -388,11 +388,6 @@ class _AccountSettingsDialogState extends State<AccountSettingsDialog> {
         // Always ensure we have the current user
         if (authState is AuthAuthenticated) {
           _currentUser = authState.user;
-          // Only update controller if it's empty (first time) or if user changed
-          if (_displayNameController.text.isEmpty ||
-              _currentUser?.displayName != _displayNameController.text) {
-            _displayNameController.text = _currentUser?.displayName ?? '';
-          }
           _avatarUrl = _currentUser?.avatarUrl;
         }
 
diff --git a/go_cloud/internal/storage/webdav.go b/go_cloud/internal/storage/webdav.go
index 0166f2e..0b3c581 100644
--- a/go_cloud/internal/storage/webdav.go
+++ b/go_cloud/internal/storage/webdav.go
@@ -91,11 +91,9 @@ func (c *WebDAVClient) Upload(ctx context.Context, remotePath string, r io.Reade
 	if c == nil {
 		return fmt.Errorf("no webdav client configured")
 	}
-	// Ensure parent collections (skip for hidden avatar folders to avoid MKCOL timeouts)
-	if !strings.HasPrefix(remotePath, ".avatars") {
-		if err := c.ensureParent(ctx, remotePath); err != nil {
-			return err
-		}
+	// Ensure parent collections
+	if err := c.ensureParent(ctx, remotePath); err != nil {
+		return err
 	}
 	// Construct URL
 	// remotePath might be like /orgs/<id>/file.txt; ensure it joins to basePrefix