diff --git a/cli/packages/cmd/login.go b/cli/packages/cmd/login.go
index 2a4729abe..da16f196d 100644
--- a/cli/packages/cmd/login.go
+++ b/cli/packages/cmd/login.go
@@ -354,7 +354,7 @@ func getFreshUserCredentials(email string, password string) (*api.GetLoginOneV2R
 
 func addNewUserPrompt() (bool, error) {
 	prompt := promptui.Select{
-		Label: "Infisical detects previous logged in users. Would you like to add a new user? Select[Yes/No]",
+		Label: "A user is already logged in. Would you like to add a new user? Select[Yes/No]",
 		Items: []string{"No", "Yes"},
 	}
 
@@ -362,6 +362,7 @@ func addNewUserPrompt() (bool, error) {
 	if err != nil {
 		return false, err
 	}
+
 	return result == "Yes", err
 }
 
diff --git a/cli/packages/cmd/switch.go b/cli/packages/cmd/user.go
similarity index 86%
rename from cli/packages/cmd/switch.go
rename to cli/packages/cmd/user.go
index e32338765..49c2db6b5 100644
--- a/cli/packages/cmd/switch.go
+++ b/cli/packages/cmd/user.go
@@ -8,6 +8,15 @@ import (
 	"github.com/spf13/cobra"
 )
 
+var userCmd = &cobra.Command{
+	Use:                   "user",
+	Short:                 "Used manage user credentials",
+	DisableFlagsInUseLine: true,
+	Example:               "infisical user",
+	Args:                  cobra.ExactArgs(0),
+	Run:                   func(cmd *cobra.Command, args []string) {},
+}
+
 var switchCmd = &cobra.Command{
 	Use:                   "switch",
 	Short:                 "Used to switch between Infisical profiles",
@@ -50,7 +59,8 @@ var switchCmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(switchCmd)
+	userCmd.AddCommand(switchCmd)
+	rootCmd.AddCommand(userCmd)
 }
 
 func getLoggedInUsers() ([]string, error) {