diff --git a/webapp/channels/src/components/preparing_workspace/organization.tsx b/webapp/channels/src/components/preparing_workspace/organization.tsx
index 684c6dc4d9..81f5c3f166 100644
--- a/webapp/channels/src/components/preparing_workspace/organization.tsx
+++ b/webapp/channels/src/components/preparing_workspace/organization.tsx
@@ -38,8 +38,8 @@ type Props = PreparingWorkspacePageProps & {
     setInviteId: (inviteId: string) => void;
 }
 
-const reportValidationError = debounce(() => {
-    trackEvent('first_admin_setup', 'validate_organization_error');
+const reportValidationError = debounce((error: string) => {
+    trackEvent('first_admin_setup', 'admin_onboarding_organization_submit_fail', {error});
 }, 700, {leading: false});
 
 const Organization = (props: Props) => {
@@ -123,7 +123,7 @@ const Organization = (props: Props) => {
         }
 
         if (validation.error || teamApiError.current) {
-            reportValidationError();
+            reportValidationError(validation.error ? validation.error : teamApiError.current! as string);
             return;
         }
         props.next?.();
diff --git a/webapp/channels/src/components/preparing_workspace/plugins.tsx b/webapp/channels/src/components/preparing_workspace/plugins.tsx
index caf04e794e..93855aa0b0 100644
--- a/webapp/channels/src/components/preparing_workspace/plugins.tsx
+++ b/webapp/channels/src/components/preparing_workspace/plugins.tsx
@@ -31,6 +31,7 @@ type Props = PreparingWorkspacePageProps & {
     setOption: (option: keyof Form['plugins']) => void;
     className?: string;
     isSelfHosted: boolean;
+    handleVisitMarketPlaceClick: () => void;
 }
 const Plugins = (props: Props) => {
     const {formatMessage} = useIntl();
@@ -178,6 +179,7 @@ const Plugins = (props: Props) => {
                                             <ExternalLink
                                                 href='https://mattermost.com/marketplace/'
                                                 location='preparing_workspace_plugins'
+                                                onClick={props.handleVisitMarketPlaceClick}
                                             >
                                                 {chunks}
                                             </ExternalLink>
diff --git a/webapp/channels/src/components/preparing_workspace/preparing_workspace.tsx b/webapp/channels/src/components/preparing_workspace/preparing_workspace.tsx
index 268e21c55e..4e0d5dc9aa 100644
--- a/webapp/channels/src/components/preparing_workspace/preparing_workspace.tsx
+++ b/webapp/channels/src/components/preparing_workspace/preparing_workspace.tsx
@@ -267,6 +267,7 @@ const PreparingWorkspace = (props: Props) => {
         const goToChannels = () => {
             dispatch({type: GeneralTypes.SHOW_LAUNCHING_WORKSPACE, open: true});
             props.history.push(`/${team.name}/channels${Constants.DEFAULT_CHANNEL}`);
+            trackEvent('first_admin_setup', 'admin_setup_complete');
         };
 
         const sendFormEnd = Date.now();
@@ -460,6 +461,9 @@ const PreparingWorkspace = (props: Props) => {
                     show={shouldShowPage(WizardSteps.Plugins)}
                     transitionDirection={getTransitionDirection(WizardSteps.Plugins)}
                     className='child-page'
+                    handleVisitMarketPlaceClick={() => {
+                        trackEvent('first_admin_setup', 'click_visit_marketplace_link');
+                    }}
                 />
                 <InviteMembers
                     onPageView={onPageViews[WizardSteps.InviteMembers]}