diff --git a/webssh/main.py b/webssh/main.py
index b50a9c9..73b9c30 100644
--- a/webssh/main.py
+++ b/webssh/main.py
@@ -2,7 +2,7 @@ import logging
 import tornado.web
 import tornado.ioloop
 
-from tornado.options import parse_command_line, options
+from tornado.options import options
 from webssh.handler import IndexHandler, WsockHandler
 from webssh.settings import (get_app_settings, get_host_keys_settings,
                              get_policy_setting, max_body_size)
@@ -20,13 +20,12 @@ def make_handlers(loop, options):
     return handlers
 
 
-def make_app(handlers, app_settings):
-    app = tornado.web.Application(handlers, **app_settings)
-    return app
+def make_app(handlers, settings):
+    return tornado.web.Application(handlers, **settings)
 
 
 def main():
-    parse_command_line()
+    options.parse_command_line()
     loop = tornado.ioloop.IOLoop.current()
     app = make_app(make_handlers(loop, options), get_app_settings(options))
     app.listen(options.port, options.address, max_body_size=max_body_size)
diff --git a/webssh/settings.py b/webssh/settings.py
index 2b72432..c3bf661 100644
--- a/webssh/settings.py
+++ b/webssh/settings.py
@@ -36,7 +36,6 @@ def get_app_settings(options):
     settings = dict(
         template_path=os.path.join(base_dir, 'webssh', 'templates'),
         static_path=os.path.join(base_dir, 'webssh', 'static'),
-        cookie_secret=uuid.uuid4().hex,
         websocket_ping_interval=options.wpIntvl,
         xsrf_cookies=(not options.debug),
         debug=options.debug