diff --git a/general/login/cli.go b/general/login/cli.go
index 437142240..55b1f59eb 100644
--- a/general/login/cli.go
+++ b/general/login/cli.go
@@ -10,5 +10,5 @@ func LoginCmd(c *cli.Context) error {
 	if c.NArg() > 0 {
 		return cliutils.WrongNumberOfArgumentsHandler(c)
 	}
-	return coreLogin.NewLoginCommand().Run()
+	return coreLogin.NewLoginCommand().SetServerId(c.String("server-id")).Run()
 }
diff --git a/main.go b/main.go
index 845ad694d..e66b3e2b1 100644
--- a/main.go
+++ b/main.go
@@ -285,6 +285,7 @@ func getCommands() ([]cli.Command, error) {
 			Usage:        loginDocs.GetDescription(),
 			HelpName:     corecommon.CreateUsage("login", loginDocs.GetDescription(), loginDocs.Usage),
 			BashComplete: corecommon.CreateBashCompletionFunc(),
+			Flags:        cliutils.GetCommandFlags(cliutils.Login),
 			Category:     otherCategory,
 			Action:       login.LoginCmd,
 		},
diff --git a/utils/cliutils/commandsflags.go b/utils/cliutils/commandsflags.go
index c264c7c54..42c850acf 100644
--- a/utils/cliutils/commandsflags.go
+++ b/utils/cliutils/commandsflags.go
@@ -125,6 +125,9 @@ const (
 	AccessTokenCreate = "access-token-create"
 	ExchangeOidcToken = "exchange-oidc-token"
 
+	// Login command key
+	Login = "login"
+
 	// *** Artifactory Commands' flags ***
 	// Base flags
 	url                 = "url"
@@ -2123,6 +2126,9 @@ var commandFlags = map[string][]string{
 	Setup: {
 		serverId, url, user, password, accessToken, sshPassphrase, sshKeyPath, ClientCertPath, ClientCertKeyPath, Project, setupRepo,
 	},
+	Login: {
+		serverId,
+	},
 }
 
 func GetCommandFlags(cmd string) []cli.Flag {