diff --git a/cmd/smd-init/main.go b/cmd/smd-init/main.go
index 5095655..0c5845a 100644
--- a/cmd/smd-init/main.go
+++ b/cmd/smd-init/main.go
@@ -96,21 +96,19 @@ func parseCmdLine() {
 	if dbPortStr == "" {
 		if val := os.Getenv(envvar); val != "" {
 			dbPortStr = val
+		} else {
+			dbPortStr = "5432"
 		}
 	}
-	if dbPortStr == "" {
-		lg.Printf("Missing DB port number")
+
+	port, err := strconv.ParseInt(dbPortStr, 10, 64)
+	if err != nil {
+		lg.Printf("Bad dbport '%s': %s", dbPortStr, err)
 		flag.Usage()
 		os.Exit(1)
-	} else {
-		port, err := strconv.ParseInt(dbPortStr, 10, 64)
-		if err != nil {
-			lg.Printf("Bad dbport '%s': %s", dbPortStr, err)
-			flag.Usage()
-			os.Exit(1)
-		}
-		dbPort = int(port)
 	}
+	dbPort = int(port)
+	
 	envvar = "SMD_DBOPTS"
 	if dbOpts == "" {
 		if val := os.Getenv(envvar); val != "" {
diff --git a/cmd/smd/main.go b/cmd/smd/main.go
index 199dfc7..4e8e927 100644
--- a/cmd/smd/main.go
+++ b/cmd/smd/main.go
@@ -653,6 +653,8 @@ func (s *SmD) parseCmdLine() {
 	if s.dbPortStr == "" {
 		if val := os.Getenv(envvar); val != "" {
 			s.dbPortStr = val
+		} else {
+			s.dbPortStr = "5432"
 		}
 	}
 	envvar = "SMD_JWKS_URL"
@@ -662,19 +664,14 @@ func (s *SmD) parseCmdLine() {
 		}
 	}
 
-	if s.dbPortStr == "" {
-		fmt.Printf("Missing DB port number")
+	port, err := strconv.ParseInt(s.dbPortStr, 10, 64)
+	if err != nil {
+		fmt.Printf("Bad dbport '%s': %s", s.dbPortStr, err)
 		flag.Usage()
 		os.Exit(1)
-	} else {
-		port, err := strconv.ParseInt(s.dbPortStr, 10, 64)
-		if err != nil {
-			fmt.Printf("Bad dbport '%s': %s", s.dbPortStr, err)
-			flag.Usage()
-			os.Exit(1)
-		}
-		s.dbPort = int(port)
 	}
+	s.dbPort = int(port)
+
 	envvar = "SMD_DBOPTS"
 	if s.dbOpts == "" {
 		if val := os.Getenv(envvar); val != "" {