diff --git a/http/handler.go b/http/handler.go
index 870b645..41dfa55 100644
--- a/http/handler.go
+++ b/http/handler.go
@@ -52,14 +52,14 @@ func (this *Handler) ServeHTTP (res http.ResponseWriter, req *http.Request) {
 	remoteAddr    := req.RemoteAddr
 	remoteAddrStr := req.RemoteAddr
 	if addr := req.Header.Get("CF-Connecting-IP"); addr != "" {
-		remoteAddr = addr
 		if this.TrustCFConnectingIP {
+			remoteAddr = addr
 			remoteAddrStr = fmt.Sprintf("%s --CF-> %s", addr, req.RemoteAddr)
 		}
 	} else if addr := req.Header.Get("X-Forwarded-For"); addr != "" {
-		remoteAddr = addr
 		if this.TrustXForwardedFor {
-			remoteAddrStr = fmt.Sprintf("%s --??-> %s", addr, req.RemoteAddr)
+			remoteAddr = addr
+			remoteAddrStr = fmt.Sprintf("%s --XF-> %s", addr, req.RemoteAddr)
 		}
 	}
 	log.Println("(i)", req.Method, req.URL, "from", remoteAddrStr)