diff --git a/clihandler/initcli.go b/clihandler/initcli.go
index c3d400b8..a41df98d 100644
--- a/clihandler/initcli.go
+++ b/clihandler/initcli.go
@@ -49,6 +49,13 @@ func getInterfaces(scanInfo *cautils.ScanInfo) componentInterfaces {
 	// Set submit behavior AFTER loading tenant config
 	setSubmitBehavior(scanInfo, tenantConfig)
 
+	if scanInfo.Submit {
+		// submit - Create tenant & Submit report
+		if err := tenantConfig.SetTenant(); err != nil {
+			logger.L().Error(err.Error())
+		}
+	}
+
 	// ================== version testing ======================================
 
 	v := cautils.NewIVersionCheckHandler()
diff --git a/clihandler/initcliutils.go b/clihandler/initcliutils.go
index a3b3217a..98514a2d 100644
--- a/clihandler/initcliutils.go
+++ b/clihandler/initcliutils.go
@@ -148,14 +148,8 @@ func setSubmitBehavior(scanInfo *cautils.ScanInfo, tenantConfig cautils.ITenantC
 			// Submit report
 			scanInfo.Submit = true
 		}
-	} else { // config not found in cache (not submitted)
-		if scanInfo.Submit {
-			// submit - Create tenant & Submit report
-			if err := tenantConfig.SetTenant(); err != nil {
-				logger.L().Error(err.Error())
-			}
-		}
 	}
+
 }
 
 // setPolicyGetter set the policy getter - local file/github release/ArmoAPI
diff --git a/resultshandling/reporter/v2/reporteventreceiver.go b/resultshandling/reporter/v2/reporteventreceiver.go
index 421cf6a5..6480212d 100644
--- a/resultshandling/reporter/v2/reporteventreceiver.go
+++ b/resultshandling/reporter/v2/reporteventreceiver.go
@@ -172,7 +172,7 @@ func (report *ReportEventReceiver) generateMessage() {
 	u.Scheme = "https"
 	u.Host = getter.GetArmoAPIConnector().GetFrontendURL()
 
-	if report.customerAdminEMail != "" { // data has been submitted
+	if report.customerAdminEMail != "" || report.token == "" { // data has been submitted
 		u.Path = fmt.Sprintf("configuration-scanning/%s", report.clusterName)
 	} else {
 		u.Path = "account/sign-up"