diff --git a/bin/bui-agent b/bin/bui-agent
index e6481b41..75537d82 100755
--- a/bin/bui-agent
+++ b/bin/bui-agent
@@ -25,7 +25,18 @@ if __name__ == '__main__':
         else:
             raise IOError('File not found: \'{0}\''.format(options.config))
     else:
-        conf_files = ['/etc/burp/buiagent.cfg', os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', 'share', 'burpui', 'etc', 'buiagent.cfg')]
+        root = os.path.join(
+            os.path.dirname(os.path.realpath(__file__)),
+            '..',
+            'share',
+            'burpui',
+            'etc'
+        )
+        conf_files = [
+            '/etc/burp/buiagent.cfg',
+            os.path.join(root, 'buiagent.cfg'),
+            os.path.join(root, 'buiagent.sample.cfg')
+        ]
         for p in conf_files:
             if os.path.isfile(p):
                 conf = p
diff --git a/burpui/__init__.py b/burpui/__init__.py
index 6dd7a5e2..3a972b4e 100644
--- a/burpui/__init__.py
+++ b/burpui/__init__.py
@@ -74,7 +74,21 @@ def init(conf=None, debug=False, logfile=None, gunicorn=True):
         else:
             raise IOError('File not found: \'{0}\''.format(conf))
     else:
-        conf_files = ['/etc/burp/burpui.cfg', os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..', '..', '..', 'share', 'burpui', 'etc', 'burpui.cfg')]
+        root = os.path.join(
+            os.path.dirname(os.path.realpath(__file__)),
+            '..',
+            '..',
+            '..',
+            '..',
+            'share',
+            'burpui',
+            'etc'
+        )
+        conf_files = [
+            '/etc/burp/burpui.cfg',
+            os.path.join(root, 'burpui.cfg'),
+            os.path.join(root, 'burpui.sample.cfg')
+        ]
         for p in conf_files:
             app.logger.debug('Trying file \'%s\'', p)
             if os.path.isfile(p):
diff --git a/contrib/gunicorn.d/burp-ui b/contrib/gunicorn.d/burp-ui
index 04fc6b3b..1ca57de5 100644
--- a/contrib/gunicorn.d/burp-ui
+++ b/contrib/gunicorn.d/burp-ui
@@ -7,7 +7,6 @@ CONFIG = {
         '--worker-class=eventlet',
         '--access-logfile=/var/log/gunicorn/burp-ui_access.log',
         '--error-logfile=/var/log/gunicorn/burp-ui_error.log',
-        '--log-level=debug',
         'burpui:init(conf="/etc/burp/burpui.cfg",logfile="/var/log/gunicorn/burp-ui_info.log")',
     ),
 }