diff --git a/cmd/rdpgw/config/configuration.go b/cmd/rdpgw/config/configuration.go
index 0a083d26cbb3a1bfe998ad4e8790fd9a1b19683c..8bd1ff45ad0ee092bc9e76688379d5a257f51e21 100644
--- a/cmd/rdpgw/config/configuration.go
+++ b/cmd/rdpgw/config/configuration.go
@@ -94,7 +94,7 @@ type ClientConfig struct {
 	// kept for backwards compatibility
 	UsernameTemplate string `koanf:"usernametemplate"`
 	SplitUserDomain  bool   `koanf:"splituserdomain"`
-	NoUsername string `koanf:"nousername"`
+	NoUsername       bool   `koanf:"nousername"`
 }
 
 func ToCamel(s string) string {
diff --git a/cmd/rdpgw/web/web.go b/cmd/rdpgw/web/web.go
index a22d83545c1f97d4075e9b155daa7900906105d4..30f4b85a784b7fe6f343de29a74153a7d5644aed 100644
--- a/cmd/rdpgw/web/web.go
+++ b/cmd/rdpgw/web/web.go
@@ -37,7 +37,7 @@ type Config struct {
 type RdpOpts struct {
 	UsernameTemplate string
 	SplitUserDomain  bool
-	NoUsername bool
+	NoUsername       bool
 }
 
 type Handler struct {
@@ -211,7 +211,7 @@ func (h *Handler) HandleDownload(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	if !NoUsername {
+	if !h.rdpOpts.NoUsername {
 		d.Settings.Username = render
 		if domain != "" {
 			d.Settings.Domain = domain