diff --git a/.gitignore b/.gitignore
index a6f89c2..a0d350f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-/target/
\ No newline at end of file
+.idea/
+zkui.iml
+/target/
diff --git a/Makefile b/Makefile
index 2082814..1f1abee 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,6 @@ build:
 	rm docker/config.cfg
 
 publish:
-	docker tag -f $(NAME):$(VERSION) $(NAME):$(VERSION)
-	docker tag -f $(NAME):$(VERSION) $(NAME):latest
-	docker push $(NAME)
\ No newline at end of file
+	docker tag $(NAME):$(VERSION) $(NAME):$(VERSION)
+	docker tag $(NAME):$(VERSION) $(NAME):latest
+	docker push $(NAME)
diff --git a/config.cfg b/config.cfg
index c62d4ae..ec7154f 100644
--- a/config.cfg
+++ b/config.cfg
@@ -41,4 +41,6 @@ keystoreManagerPwd=password
 # The default ACL to use for all creation of nodes. If left blank, then all nodes will be universally accessible
 # Permissions are based on single character flags: c (Create), r (read), w (write), d (delete), a (admin), * (all)
 # For example defaultAcl={"acls": [{"scheme":"ip", "id":"192.168.1.192", "perms":"*"}, {"scheme":"ip", id":"192.168.1.0/24", "perms":"r"}]
-defaultAcl=
\ No newline at end of file
+defaultAcl=
+# Set X-Forwarded-For to true if zkui is behind a proxy
+X-Forwarded-For=false
\ No newline at end of file
diff --git a/src/main/java/com/deem/zkui/Main.java b/src/main/java/com/deem/zkui/Main.java
index 84071e2..998c732 100644
--- a/src/main/java/com/deem/zkui/Main.java
+++ b/src/main/java/com/deem/zkui/Main.java
@@ -100,6 +100,9 @@ public static void main(String[] args) throws Exception {
             https.setPort(Integer.parseInt(globalProps.getProperty("serverPort")));
             server.setConnectors(new Connector[]{https});
         } else {
+            if(globalProps.getProperty("X-Forwarded-For").equals("true")) {
+                http_config.addCustomizer(new org.eclipse.jetty.server.ForwardedRequestCustomizer());
+            }
             ServerConnector http = new ServerConnector(server, new HttpConnectionFactory(http_config));
             http.setPort(Integer.parseInt(globalProps.getProperty("serverPort")));
             server.setConnectors(new Connector[]{http});