diff --git a/client/cmd/login.go b/client/cmd/login.go
index 549eef40e..84906a7a4 100644
--- a/client/cmd/login.go
+++ b/client/cmd/login.go
@@ -48,9 +48,6 @@ var loginCmd = &cobra.Command{
 			return err
 		}
 
-		// update host's static platform and system information
-		system.UpdateStaticInfo()
-
 		// workaround to run without service
 		if logFile == "console" {
 			err = handleRebrand(cmd)
@@ -58,6 +55,9 @@ var loginCmd = &cobra.Command{
 				return err
 			}
 
+			// update host's static platform and system information
+			system.UpdateStaticInfo()
+
 			ic := internal.ConfigInput{
 				ManagementURL: managementURL,
 				AdminURL:      adminURL,