diff --git a/cmd/rio/main.go b/cmd/rio/main.go
index 49681f5..8dd5b8c 100644
--- a/cmd/rio/main.go
+++ b/cmd/rio/main.go
@@ -63,15 +63,10 @@ func handleSubdomain(ctx *context.GlobalContext, domain, cname, path string, req
 		return
 	}
 
-	d := domain
-	if cname != "" {
-		d = cname
-	}
-
 	c := &context.Context{
 		Username:  username,
 		Reponame:  repo.Name,
-		Domain:    d,
+		Domain:    domain,
 		Path:      path,
 		Referrer:  req.Header.Get("Referer"),
 		UserAgent: req.Header.Get("User-Agent"),
@@ -288,7 +283,7 @@ func runServer(ctx *cli.Context) error {
 	go func() {
 		defer waitGroup.Done()
 
-		log.Debug("Listening on main HTTP server")
+		log.Infof("Listening on main HTTP server %s", httpAddr)
 		if err := http.Serve(listener, Handler(globalCtx)); err != nil {
 			log.Fatal(fmt.Errorf("Listening failed: %v", err))
 		}