diff --git a/frontend/src/app/app.component.html b/frontend/src/app/app.component.html
index 502eafca5..70052f9de 100644
--- a/frontend/src/app/app.component.html
+++ b/frontend/src/app/app.component.html
@@ -120,6 +120,8 @@
                     mat-flat-button color="accent"
                     data-testid="upgrade-header-link"
                     class="nav-bar__upgrade-button"
+                    angulartics2On="click"
+                    angularticsAction="Demo navbar: Create account is clicked"
                     (click)="logoutAndRedirectToRegistration()">
                     Create account
                 </button>
diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts
index b14f29b86..f86f592cf 100644
--- a/frontend/src/app/app.component.ts
+++ b/frontend/src/app/app.component.ts
@@ -1,8 +1,8 @@
 import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
+import { Angulartics2, Angulartics2Amplitude, Angulartics2OnModule } from 'angulartics2';
 import { ChangeDetectorRef, Component, HostListener, NgZone } from '@angular/core';
 import { catchError, filter, map } from 'rxjs/operators';
 
-import { Angulartics2Amplitude } from 'angulartics2';
 import { AuthService } from './services/auth.service';
 import { CommonModule } from '@angular/common';
 import { CompanyService } from './services/company.service';
@@ -49,6 +49,7 @@ amplitude.getInstance().init("9afd282be91f94da735c11418d5ff4f5");
     MatBadgeModule,
     MatMenuModule,
     MatTooltipModule,
+    Angulartics2OnModule,
     FeatureNotificationComponent
   ],
 })
@@ -93,6 +94,7 @@ export class AppComponent {
     private _tables: TablesService,
     private _uiSettings: UiSettingsService,
     angulartics2Amplitude: Angulartics2Amplitude,
+    private angulartics2: Angulartics2,
     private domSanitizer: DomSanitizer,
     private matIconRegistry: MatIconRegistry,
   ) {
@@ -118,7 +120,11 @@ export class AppComponent {
         this.page = this.router.routerState.snapshot.url;
 
         if (this.router.routerState.snapshot.root.queryParams.mode === 'demo') {
-          this._auth.loginToDemoAccount().subscribe();
+          this._auth.loginToDemoAccount().subscribe( () => {
+            this.angulartics2.eventTrack.next({
+              action: 'Demo account is logged in',
+            });
+          });
         }
     })
 
@@ -298,7 +304,6 @@ export class AppComponent {
         this.router.navigate(['/registration']);
       }
     );
-
   }
 
   logOut(isTokenExpired?: boolean) {
diff --git a/frontend/src/environments/environment.dev.ts b/frontend/src/environments/environment.dev.ts
index 2a757c5aa..d45ec81c1 100644
--- a/frontend/src/environments/environment.dev.ts
+++ b/frontend/src/environments/environment.dev.ts
@@ -3,5 +3,6 @@ export const environment = {
   saas: true,
   apiRoot: "https://app.rocketadmin.com/api",
   saasURL: "https://app.rocketadmin.com",
-  saasHostnames: ['localhost']
+  saasHostnames: ['localhost'],
+  stagingHost: ""
 };