diff --git a/util/Setup/DockerComposeBuilder.cs b/util/Setup/DockerComposeBuilder.cs
index ae805a1bbd..e0ac5f8f96 100644
--- a/util/Setup/DockerComposeBuilder.cs
+++ b/util/Setup/DockerComposeBuilder.cs
@@ -21,15 +21,19 @@ namespace Bit.Setup
 
         public bool MssqlDataDockerVolume { get; private set; }
         public int HttpPort { get; private set; } = 80;
-        public int HttpsPort { get; private set; } = 443;
+        public int HttpsPort { get; private set; }
         public string CoreVersion { get; private set; } = "latest";
         public string WebVersion { get; private set; } = "latest";
 
         public void BuildForInstaller(int httpPort, int httpsPort)
         {
-            if(httpPort != default(int) && httpsPort != default(int))
+            if(httpPort != default(int))
             {
                 HttpPort = httpPort;
+            }
+
+            if(httpsPort != default(int))
+            {
                 HttpsPort = httpsPort;
             }
 
@@ -179,8 +183,15 @@ services:
     container_name: bitwarden-nginx
     restart: always
     ports:
-      - '{HttpPort}:8080'
-      - '{HttpsPort}:8081'
+      - '{HttpPort}:8080'");
+
+                if(HttpsPort != default(int))
+                {
+                    sw.Write($@"
+      - '{HttpsPort}:8081'");
+                }
+
+                sw.Write($@"
     volumes:
       - ../nginx:/etc/bitwarden/nginx
       - ../letsencrypt:/etc/letsencrypt
diff --git a/util/Setup/Program.cs b/util/Setup/Program.cs
index b3646a7ca8..e53be74b6e 100644
--- a/util/Setup/Program.cs
+++ b/util/Setup/Program.cs
@@ -91,7 +91,12 @@ namespace Bit.Setup
             Console.Write("(!) Do you want to use the default ports for HTTP (80) and HTTPS (443)? (y/n): ");
             var defaultPorts = Console.ReadLine().ToLowerInvariant() == "y";
             int httpPort = default(int), httpsPort = default(int);
-            if(!defaultPorts)
+            if(defaultPorts)
+            {
+                httpPort = 80;
+                httpsPort = 443;
+            }
+            else
             {
                 Console.Write("(!) HTTP port: ");
                 if(int.TryParse(Console.ReadLine().ToLowerInvariant().Trim(), out httpPort))
@@ -108,8 +113,9 @@ namespace Bit.Setup
                         }
                         else
                         {
-                            Console.WriteLine("Invalid HTTPS port.");
-                            httpPort = httpsPort = default(int);
+                            Console.WriteLine("Invalid HTTPS port. Using defaults.");
+                            httpPort = 80;
+                            httpsPort = 443;
                         }
                     }
                     else if(httpPort != 80)
@@ -119,7 +125,8 @@ namespace Bit.Setup
                 }
                 else
                 {
-                    Console.WriteLine("Invalid HTTP port.");
+                    Console.WriteLine("Invalid HTTP port. Using default.")
+                    httpPort = 80;
                 }
             }