diff --git a/README.md b/README.md
index 114ef61..7b8eff0 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ You can also pass the `--step` flag to begin at a certain spot in the interactiv
 sudo wbi setup --step workbench
 ```
 
-The following steps are valid options: start, prereqs, user, firewall, security, languages, r, python, workbench, license, jupyter, prodrivers, ssl, packagemanager, connect, restart, status, verify.
+The following steps are valid options: start, prereqs, firewall, security, languages, r, python, workbench, license, jupyter, prodrivers, ssl, packagemanager, connect, restart, status, verify.
 
 ## Assumptions
 - Single server
diff --git a/cmd/setup.go b/cmd/setup.go
index 073f36a..7340f94 100644
--- a/cmd/setup.go
+++ b/cmd/setup.go
@@ -70,15 +70,6 @@ func newSetup(setupOpts setupOpts) error {
 		if err != nil {
 			return err
 		}
-		step = "user"
-	}
-
-	var username string
-	if step == "user" {
-		username, err = operatingsystem.PromptAndVerifyUser()
-		if err != nil {
-			return err
-		}
 		step = "firewall"
 	}
 
@@ -282,11 +273,9 @@ func newSetup(setupOpts setupOpts) error {
 			return fmt.Errorf("issue selecting if verification is to be run: %w", err)
 		}
 		if verifyChoice {
-			if username == "" {
-				username, err = operatingsystem.PromptAndVerifyUser()
-				if err != nil {
-					return err
-				}
+			username, err := operatingsystem.PromptAndVerifyUser()
+			if err != nil {
+				return err
 			}
 			err = workbench.VerifyInstallation(username)
 			if err != nil {
@@ -326,7 +315,7 @@ func (opts *setupOpts) Validate(args []string) error {
 		return fmt.Errorf("no arguments are supported for this command")
 	}
 	// ensure step is valid
-	validSteps := []string{"start", "prereqs", "user", "firewall", "security", "languages", "r", "python", "workbench", "license", "jupyter", "prodrivers", "ssl", "packagemanager", "connect", "restart", "status", "verify"}
+	validSteps := []string{"start", "prereqs", "firewall", "security", "languages", "r", "python", "workbench", "license", "jupyter", "prodrivers", "ssl", "packagemanager", "connect", "restart", "status", "verify"}
 	if opts.step != "" && !lo.Contains(validSteps, opts.step) {
 		return fmt.Errorf("invalid step: %s", opts.step)
 	}
@@ -368,7 +357,7 @@ func newSetupCmd() *setupCmd {
 		SilenceUsage: true,
 	}
 
-	stepHelp := `The step to start at. Valid steps are: start, prereqs, user, firewall, security, languages, r, python, workbench, license, jupyter, prodrivers, ssl, packagemanager, connect, restart, status, verify.`
+	stepHelp := `The step to start at. Valid steps are: start, prereqs, firewall, security, languages, r, python, workbench, license, jupyter, prodrivers, ssl, packagemanager, connect, restart, status, verify.`
 
 	cmd.Flags().StringP("step", "s", "", stepHelp)
 	viper.BindPFlag("step", cmd.Flags().Lookup("step"))