diff --git a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
index 2e4101eef6..f343310096 100644
--- a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
@@ -160,7 +160,6 @@ const RemixApp = (props: IRemixAppUi) => {
   const handleUserChosenType = async (type) => {
     setShowEnterDialog(false)
     localStorage.setItem('hadUsageTypeAsked', type)
-
     // Use the type to setup the UI accordingly
     switch (type) {
     case UsageTypes.Beginner: {
@@ -172,28 +171,24 @@ const RemixApp = (props: IRemixAppUi) => {
       //   await props.app.appManager.call('filePanel', 'createWorkspace', wName, 'playground')
       // }
       // await props.app.appManager.call('filePanel', 'switchToWorkspace', { name: wName, isLocalHost: false })
-
-      _paq.push(['trackEvent', 'enterDialog', 'usageType', 'beginner'])
-      _paq.push(['trackEvent', 'userEntry', 'usageType', 'beginner'])
       break
     }
     case UsageTypes.Advance: {
-      _paq.push(['trackEvent', 'enterDialog', 'usageType', 'advanced'])
-      _paq.push(['trackEvent', 'userEntry', 'usageType', 'advanced'])
+      // Here activate necessary plugins, walkthrough. Filter hometab features slides and plugins.
       break
     }
     case UsageTypes.Prototyper: {
-      _paq.push(['trackEvent', 'enterDialog', 'usageType', 'prototyper'])
-      _paq.push(['trackEvent', 'userEntry', 'usageType', 'prototyper'])
+      // Here activate necessary plugins, walkthrough. Filter hometab features slides and plugins.
       break
     }
     case UsageTypes.Production: {
-      _paq.push(['trackEvent', 'enterDialog', 'usageType', 'production'])
-      _paq.push(['trackEvent', 'userEntry', 'usageType', 'production'])
+      // Here activate necessary plugins, walkthrough. Filter hometab features slides and plugins.
       break
     }
     default: throw new Error()
     }
+    _paq.push(['trackEvent', 'enterDialog', 'usageType', type])
+    _paq.push(['trackEvent', 'userEntry', 'usageType', type])
   }
 
   return (
diff --git a/libs/remix-ui/app/src/lib/remix-app/types/index.ts b/libs/remix-ui/app/src/lib/remix-app/types/index.ts
index dce9885100..824243b102 100644
--- a/libs/remix-ui/app/src/lib/remix-app/types/index.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/types/index.ts
@@ -18,8 +18,8 @@ export const enum AppModalCancelTypes {
 }
 
 export const enum UsageTypes {
-  Beginner = 1,
-  Prototyper,
-  Advance,
-  Production
+  Beginner = 'beginner',
+  Prototyper = 'prototyper',
+  Advance = 'advance',
+  Production = 'prototyper'
 }
\ No newline at end of file