diff --git a/cmd/argo/commands/server.go b/cmd/argo/commands/server.go
index 0bfa140bb398..011bf1abd4d8 100644
--- a/cmd/argo/commands/server.go
+++ b/cmd/argo/commands/server.go
@@ -80,7 +80,7 @@ See %s`, help.ArgoSever),
 				// InsecureSkipVerify will not impact the TLS listener. It is needed for the server to speak to itself for GRPC.
 				tlsConfig = &tls.Config{Certificates: []tls.Certificate{cer}, InsecureSkipVerify: true}
 			} else {
-				log.Warn("You are running in insecure mode. How enable transport security: https://github.com/argoproj/argo/blob/master/docs/tls.md")
+				log.Warn("You are running in insecure mode. Learn how to enable transport layer security: https://github.com/argoproj/argo/blob/master/docs/tls.md")
 			}
 
 			opts := apiserver.ArgoServerOpts{
diff --git a/server/apiserver/argoserver.go b/server/apiserver/argoserver.go
index 64548ea24be5..0db3d03c663e 100644
--- a/server/apiserver/argoserver.go
+++ b/server/apiserver/argoserver.go
@@ -171,9 +171,12 @@ func (as *argoServer) Run(ctx context.Context, port int, browserOpenFunc func(st
 	go func() { as.checkServeErr("grpcServer", grpcServer.Serve(grpcL)) }()
 	go func() { as.checkServeErr("httpServer", httpServer.Serve(httpL)) }()
 	go func() { as.checkServeErr("tcpm", tcpm.Serve()) }()
-	log.Infof("Argo Server started successfully on address %s", address)
-
-	browserOpenFunc("http://localhost" + address)
+	url := "http://localhost" + address
+	if as.tlsConfig != nil {
+		url = "https://localhost" + address
+	}
+	log.Infof("Argo Server started successfully on %s", url)
+	browserOpenFunc(url)
 
 	<-as.stopCh
 }
diff --git a/ui/src/app/webpack.config.js b/ui/src/app/webpack.config.js
index 47693d8acb29..77549118b3df 100644
--- a/ui/src/app/webpack.config.js
+++ b/ui/src/app/webpack.config.js
@@ -62,15 +62,15 @@ const config = {
         },
         proxy: {
             '/api': {
-                'target': isProd ? '' : 'http://localhost:2746',
+                'target': isProd ? '' : 'https://localhost:2746',
                 'secure': false,
             },
             '/artifacts': {
-                'target': isProd ? '' : 'http://localhost:2746',
+                'target': isProd ? '' : 'https://localhost:2746',
                 'secure': false,
             },
             '/artifacts-by-uid': {
-                'target': isProd ? '' : 'http://localhost:2746',
+                'target': isProd ? '' : 'https://localhost:2746',
                 'secure': false,
             }
         }