diff --git a/jslib b/jslib
index cfc7687815..5c961ce847 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit cfc76878154c5b292b729e2909bec1848f5cc23c
+Subproject commit 5c961ce847dd9ba13784ff9ba268753aae3a8c2e
diff --git a/src/app/organizations/vault/attachments.component.ts b/src/app/organizations/vault/attachments.component.ts
index de214478cd..4c8b8a403e 100644
--- a/src/app/organizations/vault/attachments.component.ts
+++ b/src/app/organizations/vault/attachments.component.ts
@@ -25,8 +25,8 @@ export class AttachmentsComponent extends BaseAttachmentsComponent {
 
     constructor(cipherService: CipherService, i18nService: I18nService,
         cryptoService: CryptoService, userService: UserService,
-        platformUtilsService: PlatformUtilsService, private apiService: ApiService) {
-        super(cipherService, i18nService, cryptoService, userService, platformUtilsService);
+        platformUtilsService: PlatformUtilsService, apiService: ApiService) {
+        super(cipherService, i18nService, cryptoService, userService, platformUtilsService, apiService);
     }
 
     protected async reupload(attachment: AttachmentView) {
diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts
index e7fc177fde..d3ee0273be 100644
--- a/src/app/services/services.module.ts
+++ b/src/app/services/services.module.ts
@@ -108,14 +108,14 @@ const apiService = new ApiService(tokenService, platformUtilsService,
 const userService = new UserService(tokenService, storageService);
 const settingsService = new SettingsService(userService, storageService);
 export let searchService: SearchService = null;
+const fileUploadService = new FileUploadService(consoleLogService, apiService);
 const cipherService = new CipherService(cryptoService, userService, settingsService,
-    apiService, storageService, i18nService, () => searchService);
+    apiService, fileUploadService, storageService, i18nService, () => searchService);
 const folderService = new FolderService(cryptoService, userService, apiService, storageService,
     i18nService, cipherService);
 const collectionService = new CollectionService(cryptoService, userService, storageService, i18nService);
 searchService = new SearchService(cipherService, consoleLogService);
 const policyService = new PolicyService(userService, storageService);
-const fileUploadService = new FileUploadService(consoleLogService, apiService);
 const sendService = new SendService(cryptoService, userService, apiService, fileUploadService, storageService,
     i18nService, cryptoFunctionService);
 const vaultTimeoutService = new VaultTimeoutService(cipherService, folderService, collectionService,
diff --git a/src/app/settings/emergency-access-attachments.component.ts b/src/app/settings/emergency-access-attachments.component.ts
index 8cbbfb1062..ca93301204 100644
--- a/src/app/settings/emergency-access-attachments.component.ts
+++ b/src/app/settings/emergency-access-attachments.component.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 
+import { ApiService } from 'jslib/abstractions/api.service';
 import { CipherService } from 'jslib/abstractions/cipher.service';
 import { CryptoService } from 'jslib/abstractions/crypto.service';
 import { I18nService } from 'jslib/abstractions/i18n.service';
@@ -20,8 +21,8 @@ export class EmergencyAccessAttachmentsComponent extends BaseAttachmentsComponen
 
     constructor(cipherService: CipherService, i18nService: I18nService,
         cryptoService: CryptoService, userService: UserService,
-        platformUtilsService: PlatformUtilsService) {
-        super(cipherService, i18nService, cryptoService, userService, platformUtilsService, window);
+        platformUtilsService: PlatformUtilsService, apiService: ApiService) {
+        super(cipherService, i18nService, cryptoService, userService, platformUtilsService, apiService, window);
     }
 
     protected async init() {
diff --git a/src/app/settings/emergency-access-view.component.ts b/src/app/settings/emergency-access-view.component.ts
index ae7fd65226..e84bdb3a34 100644
--- a/src/app/settings/emergency-access-view.component.ts
+++ b/src/app/settings/emergency-access-view.component.ts
@@ -84,6 +84,7 @@ export class EmergencyAccessViewComponent implements OnInit {
         const childComponent = this.modal.show<EmergencyAccessAttachmentsComponent>(EmergencyAccessAttachmentsComponent, this.attachmentsModalRef);
 
         childComponent.cipher = cipher;
+        childComponent.emergencyAccessId = this.id;
 
         this.modal.onClosed.subscribe(async () => {
             this.modal = null;
diff --git a/src/app/vault/attachments.component.ts b/src/app/vault/attachments.component.ts
index 109a00a1cf..714f28cd10 100644
--- a/src/app/vault/attachments.component.ts
+++ b/src/app/vault/attachments.component.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 
+import { ApiService } from 'jslib/abstractions/api.service';
 import { CipherService } from 'jslib/abstractions/cipher.service';
 import { CryptoService } from 'jslib/abstractions/crypto.service';
 import { I18nService } from 'jslib/abstractions/i18n.service';
@@ -19,8 +20,8 @@ export class AttachmentsComponent extends BaseAttachmentsComponent {
 
     constructor(cipherService: CipherService, i18nService: I18nService,
         cryptoService: CryptoService, userService: UserService,
-        platformUtilsService: PlatformUtilsService) {
-        super(cipherService, i18nService, cryptoService, userService, platformUtilsService, window);
+        platformUtilsService: PlatformUtilsService, apiService: ApiService) {
+        super(cipherService, i18nService, cryptoService, userService, platformUtilsService, apiService, window);
     }
 
     protected async reupload(attachment: AttachmentView) {
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index b258dd93f9..6f65c451a9 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -437,7 +437,7 @@
     "message": "Select a file."
   },
   "maxFileSize": {
-    "message": "Maximum file size is 100 MB."
+    "message": "Maximum file size is 500 MB."
   },
   "updateKey": {
     "message": "You cannot use this feature until you update your encryption key."