diff --git a/internal/config/generator.go b/internal/config/generator.go
index e129a87e..6e0de82e 100644
--- a/internal/config/generator.go
+++ b/internal/config/generator.go
@@ -190,6 +190,7 @@ func (c *JiraCLIConfigGenerator) configureInstallationType() error {
 	return nil
 }
 
+//nolint:gocyclo
 func (c *JiraCLIConfigGenerator) configureServerAndLoginDetails() error {
 	var qs []*survey.Question
 
@@ -288,8 +289,12 @@ func (c *JiraCLIConfigGenerator) configureServerAndLoginDetails() error {
 			return err
 		}
 
-		c.value.server = ans.Server
-		c.value.login = ans.Login
+		if ans.Server != "" {
+			c.value.server = ans.Server
+		}
+		if ans.Login != "" {
+			c.value.login = ans.Login
+		}
 	}
 
 	return c.verifyLoginDetails(c.value.server, c.value.login)