diff --git a/src/app/accounts/register.component.ts b/src/app/accounts/register.component.ts
index a617bf8c8e..9a8aa41a68 100644
--- a/src/app/accounts/register.component.ts
+++ b/src/app/accounts/register.component.ts
@@ -79,6 +79,11 @@ export class RegisterComponent extends BaseRegisterComponent {
             }
             if (qParams.reference != null) {
                 this.referenceId = qParams.reference;
+            } else {
+                this.referenceId = ('; ' + document.cookie).split('; reference=').pop().split(';').shift();
+            }
+            if (this.referenceId === '') {
+                this.referenceId = null;
             }
             if (queryParamsSub != null) {
                 queryParamsSub.unsubscribe();
@@ -99,12 +104,6 @@ export class RegisterComponent extends BaseRegisterComponent {
         if (this.policies != null) {
             this.enforcedPolicyOptions = await this.policyService.getMasterPasswordPolicyOptions(this.policies);
         }
-
-        const referenceId = ('; ' + document.cookie).split('; reference=').pop().split(';').shift();
-        this.referenceId = this.referenceId || referenceId;
-        if (this.referenceId === '') {
-            this.referenceId = null;
-        }
     }
 
     async submit() {
diff --git a/src/app/layouts/organization-layout.component.ts b/src/app/layouts/organization-layout.component.ts
index 79abc291a5..67269d9e25 100644
--- a/src/app/layouts/organization-layout.component.ts
+++ b/src/app/layouts/organization-layout.component.ts
@@ -8,8 +8,8 @@ import { ActivatedRoute } from '@angular/router';
 
 import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
 
-import { UserService } from 'jslib/abstractions/user.service';
 import { EnvironmentService } from 'jslib/abstractions/environment.service';
+import { UserService } from 'jslib/abstractions/user.service';
 
 import { Organization } from 'jslib/models/domain/organization';