diff --git a/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.html b/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.html
index 21debaee0..26a91f391 100644
--- a/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.html
+++ b/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.html
@@ -28,7 +28,7 @@
                     matTooltip="Duplicate row">
                     <mat-icon fontSet="material-icons-outlined">difference</mat-icon>
                 </a>
-                <button type="button" mat-icon-button *ngIf="permissions.delete && hasKeyAttributesFromURL"
+                <button type="button" mat-icon-button *ngIf="permissions.delete && canDelete && hasKeyAttributesFromURL"
                     matTooltip="Delete row"
                     (click)="handleDeleteRow()">
                     <mat-icon fontSet="material-icons-outlined">delete</mat-icon>
diff --git a/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts b/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts
index f7c9986c4..a888843d2 100644
--- a/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts
+++ b/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts
@@ -103,6 +103,7 @@ export class DbTableRowEditComponent implements OnInit {
   public referencedTablesURLParams: any;
   public isDesktop: boolean = true;
   public permissions: TablePermissions;
+  public canDelete: boolean;
   public pageAction: string;
   public tableFiltersUrlString: string;
   public backUrlParams: object;
@@ -214,6 +215,7 @@ export class DbTableRowEditComponent implements OnInit {
             this.dispalyTableName = res.display_name || normalizeTableName(this.tableName);
             this.title.setTitle(`${this.dispalyTableName} - Edit record | Rocketadmin`);
             this.permissions = res.table_access_level;
+            this.canDelete = res.can_delete;
             this.keyAttributesListFromStructure = res.primaryColumns.map((field: TableField) => field.column_name);
 
             this.nonModifyingFields = res.structure
diff --git a/frontend/src/app/services/connections.service.spec.ts b/frontend/src/app/services/connections.service.spec.ts
index 639f78102..e0f468c31 100644
--- a/frontend/src/app/services/connections.service.spec.ts
+++ b/frontend/src/app/services/connections.service.spec.ts
@@ -599,8 +599,6 @@ describe('ConnectionsService', () => {
 
     service.getConnectionSettings('12345678').subscribe(res => {
         expect(res).toEqual(connectionSettingsNetwork);
-        expect(service.connectionLogo).toEqual('https://example.com/logo.png');
-        expect(service.companyName).toEqual('Example Company');
         expect(mockThemeService.updateColors).toHaveBeenCalledWith({
             palettes: { primaryPalette: '#123456', accentedPalette: '#654321' },
         });
diff --git a/frontend/src/app/services/connections.service.ts b/frontend/src/app/services/connections.service.ts
index 394bc0b87..572c2f46e 100644
--- a/frontend/src/app/services/connections.service.ts
+++ b/frontend/src/app/services/connections.service.ts
@@ -54,8 +54,6 @@ export class ConnectionsService {
   public connectionAccessLevel: AccessLevel;
   public groupsAccessLevel: boolean;
   public currentPage: string;
-  public connectionLogo: string;
-  public companyName: string;
   public isCustomAccentedColor: boolean;
   public defaultDisplayTable: string;
   public ownConnections: Connection[] = null;
@@ -104,14 +102,6 @@ export class ConnectionsService {
     return this.defineConnectionTitle(this.connection);
   }
 
-  get logo() {
-    return this.connectionLogo;
-  }
-
-  get name() {
-    return this.companyName;
-  }
-
   get defaultTableToOpen() {
     return this.defaultDisplayTable;
   }
@@ -160,6 +150,7 @@ export class ConnectionsService {
   }
 
   setConnectionInfo(id: string) {
+    this.defaultDisplayTable = null;
     if (id) {
       this.fetchConnection(id).subscribe(res => {
         this.connection = res.connection;
@@ -168,27 +159,22 @@ export class ConnectionsService {
         this.connectionNameSubject.next(res.connection.title || res.connection.database);
         this.connectionSigningKeySubject.next(res.connection.signing_key);
         if (res.connectionProperties) {
-          this.connectionLogo = res.connectionProperties.logo_url;
-          this.companyName = res.connectionProperties.company_name;
           this.defaultDisplayTable = res.connectionProperties.default_showing_table;
           this.isCustomAccentedColor = !!res.connectionProperties.secondary_color;
           this._themeService.updateColors({ palettes: { primaryPalette: res.connectionProperties.primary_color, accentedPalette: res.connectionProperties.secondary_color }});
         } else {
-          this.connectionLogo = null;
-          this.companyName = null;
-          this.defaultDisplayTable = null;
           this.isCustomAccentedColor = false;
           this._themeService.updateColors({ palettes: { primaryPalette: '#212121', accentedPalette: '#C177FC' }});
         }
       });
     } else {
       this.connection = {...this.connectionInitialState};
-      this.connectionLogo = null;
-      this.companyName = null;
-      this.defaultDisplayTable = null;
       this.isCustomAccentedColor = false;
       this._themeService.updateColors({ palettes: { primaryPalette: '#212121', accentedPalette: '#C177FC' }});
     }
+
+    console.log('this.defaultDisplayTable');
+    console.log(this.defaultDisplayTable);
   }
 
   isPermitted(accessLevel: AccessLevel) {
@@ -246,9 +232,11 @@ export class ConnectionsService {
         map(res => {
           const connection = this.defineConnectionType(res.connection);
           if (res.connectionProperties) {
-            this.connectionLogo = res.connectionProperties.logo_url;
-            this.companyName = res.connectionProperties.company_name;
+            this.defaultDisplayTable = res.connectionProperties.default_showing_table;
             this._themeService.updateColors({ palettes: { primaryPalette: res.connectionProperties.primary_color, accentedPalette: res.connectionProperties.secondary_color }});
+          } else {
+            this.defaultDisplayTable = null;
+            this._themeService.updateColors({ palettes: { primaryPalette: '#212121', accentedPalette: '#C177FC' }});
           }
           return {...res, connection};
         }),
@@ -416,8 +404,6 @@ export class ConnectionsService {
     .pipe(
       map((res: any) => {
         if (res) {
-          this.connectionLogo = res.logo_url;
-          this.companyName = res.company_name;
           this._themeService.updateColors({ palettes: { primaryPalette: res.primary_color, accentedPalette: res.secondary_color }});
         }
         return res;