diff --git a/src/app/adf-services/df-service-details/df-paywall-modal.html b/src/app/adf-services/df-service-details/df-paywall-modal.html
index 27cbc03e..078dfadf 100644
--- a/src/app/adf-services/df-service-details/df-paywall-modal.html
+++ b/src/app/adf-services/df-service-details/df-paywall-modal.html
@@ -29,7 +29,7 @@ <h3 class="paywall-contact">
       >
       |
       <a href="mailto:info@dreamfactory.com"
-        >{{ 'email' | transloco }}: info@dreamfactory.com</a
+        >{{ 'email' | transloco }}: info&#64;dreamfactory.com</a
       >
     </h3>
     <div #calendlyWidget class="calendly-inline-widget"></div>
diff --git a/src/app/adf-user-management/df-password-reset/df-password-reset.component.html b/src/app/adf-user-management/df-password-reset/df-password-reset.component.html
index ad49d609..3d34d358 100644
--- a/src/app/adf-user-management/df-password-reset/df-password-reset.component.html
+++ b/src/app/adf-user-management/df-password-reset/df-password-reset.component.html
@@ -13,8 +13,8 @@
             (type === 'reset'
               ? 'resetPassword'
               : type === 'register'
-              ? 'registrationConfirmation'
-              : 'invitatonConfirmation') | transloco
+                ? 'registrationConfirmation'
+                : 'invitatonConfirmation') | transloco
         }}
       </mat-card-title>
     </mat-card-header>
diff --git a/src/app/adf-user-management/services/df-password.service.ts b/src/app/adf-user-management/services/df-password.service.ts
index 48e33754..355c8430 100644
--- a/src/app/adf-user-management/services/df-password.service.ts
+++ b/src/app/adf-user-management/services/df-password.service.ts
@@ -60,11 +60,9 @@ export class DfPasswordService {
     hasSecurityQuestion = false
   ) {
     return this.http
-      .post<SecurityQuestion | GenericSuccessResponse>(
-        URLS.USER_PASSWORD,
-        data,
-        hasSecurityQuestion ? HTTP_OPTION_LOGIN_FALSE : HTTP_OPTION_RESET_TRUE
-      )
+      .post<
+        SecurityQuestion | GenericSuccessResponse
+      >(URLS.USER_PASSWORD, data, hasSecurityQuestion ? HTTP_OPTION_LOGIN_FALSE : HTTP_OPTION_RESET_TRUE)
       .pipe(
         catchError(() => {
           return this.http.post<SecurityQuestion | GenericSuccessResponse>(
diff --git a/src/app/shared/components/df-dynamic-field/df-dynamic-field.component.html b/src/app/shared/components/df-dynamic-field/df-dynamic-field.component.html
index afde76ea..b1d53cd7 100644
--- a/src/app/shared/components/df-dynamic-field/df-dynamic-field.component.html
+++ b/src/app/shared/components/df-dynamic-field/df-dynamic-field.component.html
@@ -21,8 +21,8 @@
       schema.type === 'integer'
         ? 'number'
         : schema.type === 'password'
-        ? 'password'
-        : 'text'
+          ? 'password'
+          : 'text'
     "
     [attr.aria-label]="schema.label" />
   <mat-select
diff --git a/src/app/shared/components/df-manage-table/df-manage-table.component.ts b/src/app/shared/components/df-manage-table/df-manage-table.component.ts
index 1692d86e..30275c4d 100644
--- a/src/app/shared/components/df-manage-table/df-manage-table.component.ts
+++ b/src/app/shared/components/df-manage-table/df-manage-table.component.ts
@@ -211,17 +211,10 @@ export abstract class DfManageTableComponent<T>
   }
 
   viewRow(row: T): void {
-    // eslint-disable-next-line no-useless-escape
-    const regex = /\/api\-connections/;
-    if (this.router.url.match(regex)) {
-      this.router.navigate([`${(row as any).id}-${(row as any).name}`], {
-        relativeTo: this._activatedRoute,
-      });
-    } else {
-      this.router.navigate([`${(row as any).id}`], {
-        relativeTo: this._activatedRoute,
-      });
-    }
+    this.router.navigate([(row as any).id], {
+      relativeTo: this._activatedRoute,
+    });
+
   }
 
   announceSortChange(sortState: any) {
diff --git a/src/app/shared/components/df-paywall/df-paywall.component.html b/src/app/shared/components/df-paywall/df-paywall.component.html
index 2017c43c..ec006e31 100644
--- a/src/app/shared/components/df-paywall/df-paywall.component.html
+++ b/src/app/shared/components/df-paywall/df-paywall.component.html
@@ -24,6 +24,6 @@ <h2>{{ 'paywall.speakToHuman' | transloco }}</h2>
 <h3 class="paywall-contact">
   <a href="tel:+1 415-993-5877">{{ 'phone' | transloco }}: +1 415-993-5877</a> |
   <a href="mailto:info@dreamfactory.com"
-    >{{ 'email' | transloco }}: info@dreamfactory.com</a
+    >{{ 'email' | transloco }}: info&#64;dreamfactory.com</a
   >
 </h3>
diff --git a/src/app/shared/components/df-script-editor/df-script-editor.component.ts b/src/app/shared/components/df-script-editor/df-script-editor.component.ts
index 624b14fc..a32fe1e3 100644
--- a/src/app/shared/components/df-script-editor/df-script-editor.component.ts
+++ b/src/app/shared/components/df-script-editor/df-script-editor.component.ts
@@ -109,9 +109,11 @@ export class DfScriptEditorComponent implements OnInit {
   }
 
   viewLatest() {
-    const filePath = `${this.storageServices.find(
-      service => service.id === this.storageServiceId.getRawValue()
-    )?.name}/${this.storagePath.getRawValue()}`;
+    const filePath = `${
+      this.storageServices.find(
+        service => service.id === this.storageServiceId.getRawValue()
+      )?.name
+    }/${this.storagePath.getRawValue()}`;
     if (filePath.endsWith('.json')) {
       this.fileService
         .downloadJson(filePath)
diff --git a/src/app/shared/components/df-verb-picker/df-verb-picker.component.ts b/src/app/shared/components/df-verb-picker/df-verb-picker.component.ts
index 9b75b3ff..1592ae1a 100644
--- a/src/app/shared/components/df-verb-picker/df-verb-picker.component.ts
+++ b/src/app/shared/components/df-verb-picker/df-verb-picker.component.ts
@@ -115,10 +115,11 @@ export class DfVerbPickerComponent implements ControlValueAccessor, DoCheck {
         this.type === 'number'
           ? (selected || []).reduce((acc: number, val: number) => acc | val, 0)
           : this.type === 'verb_multiple'
-          ? ((selected || []).map(
-              (v: any) => this.verbs.find(vr => vr.value === v)?.altValue ?? ''
-            ) as Array<Verb>)
-          : this.verbs.find(vr => vr.value === selected)?.altValue ?? '';
+            ? ((selected || []).map(
+                (v: any) =>
+                  this.verbs.find(vr => vr.value === v)?.altValue ?? ''
+              ) as Array<Verb>)
+            : this.verbs.find(vr => vr.value === selected)?.altValue ?? '';
       this.onChange(total);
     });
   }