diff --git a/ci/tasks/build-bundle.yml b/ci/tasks/build-bundle.yml
index ab9c69c..e8ffb69 100644
--- a/ci/tasks/build-bundle.yml
+++ b/ci/tasks/build-bundle.yml
@@ -23,5 +23,6 @@ run:
     cd $GOPATH/src/github.com/dispatchframework/dispatch-ui
     npm install
     npm run build
+    cp main.py ./build/
     tar -czvf dispatch-ui.tar.gz ./build
     mv dispatch-ui.tar.gz $GOPATH/dispatch-ui-binaries/
diff --git a/main.py b/main.py
index 548e711..91e79b7 100644
--- a/main.py
+++ b/main.py
@@ -1,12 +1,14 @@
 #!/bin/python
 from flask import Flask, request
+import argparse
 import os
 
 app = Flask(__name__)
 
+org = "dispatch-server"
 def add_header(args):
 	args.append('"Cookie: cookie"')
-	args.append('"X-Dispatch-Org: default"')
+	args.append('"X-Dispatch-Org: %s"' % org)
 	args.append('"accept: application/json"')
 	args.append('"content-type: application/json"')
 
@@ -65,10 +67,15 @@ def run():
 	add_header(args)
 	args.append('"Accept-Encoding: gzip"')
 	cmd = " -H ".join(args)
-	cmd += " -d '%s'" % request.data
+	cmd += " -d '%s'" % request.data.decode("utf-8")
 	resp = os.popen(cmd).read()
 	return resp, 200, {'Access-Control-Allow-Origin': '*'}
 
 
 if __name__ == '__main__':
-    app.run()
\ No newline at end of file
+	parser = argparse.ArgumentParser()
+	parser.add_argument("-o", "--organization", help="Organization name, default: dispatch-server")
+	args = parser.parse_args()
+	if args.organization:
+		org = args.organization
+	app.run()