diff --git a/frontend/src/app/components/medical-sources-connected/medical-sources-connected.component.html b/frontend/src/app/components/medical-sources-connected/medical-sources-connected.component.html
index 5171eb64..d19037c9 100644
--- a/frontend/src/app/components/medical-sources-connected/medical-sources-connected.component.html
+++ b/frontend/src/app/components/medical-sources-connected/medical-sources-connected.component.html
@@ -18,7 +18,7 @@
     </button>
   </div>
 
-  <div *ngIf="modalSelectedSourceListItem.source?.platform_type != 'fasten'; else fastenSourceDescription" class="modal-body">
+  <div *ngIf="modalSelectedSourceListItem?.source?.platform_type != 'fasten'; else fastenSourceDescription" class="modal-body">
     <h6>Manage Source</h6>
     <p>Existing connections can be "Synced", "Reconnected" or "Deleted"</p>
     <ul>
@@ -43,7 +43,7 @@
     <a routerLink="/explore/{{modalSelectedSourceListItem?.source?.id}}" (click)="modal.close()" class="btn btn-indigo mr-auto">Explore</a>
 
 
-    <div *ngIf="modalSelectedSourceListItem.source?.platform_type != 'fasten'" class="d-inline-block" ngbDropdown>
+    <div *ngIf="modalSelectedSourceListItem?.source?.platform_type != 'fasten'" class="d-inline-block" ngbDropdown>
       <button
         type="button"
         class="btn btn-outline-indigo"
@@ -52,8 +52,8 @@
         Actions
       </button>
       <div ngbDropdownMenu aria-labelledby="dropdownManual">
-        <button *ngIf="modalSelectedSourceListItem.source?.platform_type != 'manual'" ngbDropdownItem (click)="sourceSyncHandler(modalSelectedSourceListItem.source)" type="button" class="btn btn-indigo">Sync</button>
-        <button *ngIf="modalSelectedSourceListItem.source?.platform_type != 'manual'" ngbDropdownItem (click)="sourceReconnectHandler(modalSelectedSourceListItem)" type="button" class="btn btn-danger">Reconnect</button>
+        <button *ngIf="modalSelectedSourceListItem?.source?.platform_type != 'manual'" ngbDropdownItem (click)="sourceSyncHandler(modalSelectedSourceListItem.source)" type="button" class="btn btn-indigo">Sync</button>
+        <button *ngIf="modalSelectedSourceListItem?.source?.platform_type != 'manual'" ngbDropdownItem (click)="sourceReconnectHandler(modalSelectedSourceListItem)" type="button" class="btn btn-danger">Reconnect</button>
         <button  ngbDropdownItem (click)="sourceDeleteHandler()" type="button" class="btn btn-danger">Delete</button>
       </div>
     </div>
diff --git a/frontend/src/app/components/medical-sources-connected/medical-sources-connected.component.ts b/frontend/src/app/components/medical-sources-connected/medical-sources-connected.component.ts
index 1c335fe0..7264bc6c 100644
--- a/frontend/src/app/components/medical-sources-connected/medical-sources-connected.component.ts
+++ b/frontend/src/app/components/medical-sources-connected/medical-sources-connected.component.ts
@@ -383,12 +383,21 @@ export class MedicalSourcesConnectedComponent implements OnInit {
     let endpointId = selectedSourceListItem?.source?.endpoint_id
     this.lighthouseApi.getLighthouseSource(endpointId)
       .then(async (sourceMetadata: LighthouseSourceMetadata) => {
+
+        if(selectedSourceListItem?.source){
+          sourceMetadata.brand_id = selectedSourceListItem.source.brand_id
+          sourceMetadata.portal_id = selectedSourceListItem.source.portal_id
+        }
+
         console.log(sourceMetadata);
         let authorizationUrl = await this.lighthouseApi.generateSourceAuthorizeUrl(sourceMetadata, selectedSourceListItem.source.id)
 
         console.log('authorize url:', authorizationUrl.toString());
         // redirect to lighthouse with uri's (or open a new window in desktop mode)
         this.lighthouseApi.redirectWithOriginAndDestination(authorizationUrl.toString(), sourceMetadata).subscribe((desktopRedirectData) => {
+          if(!desktopRedirectData){
+            return //wait for redirect
+          }
           //Note: this code will only run in Desktop mode (with popups)
           //in non-desktop environments, the user is redirected in the same window, and this code is never executed.