diff --git a/app/app.py b/app/app.py
index 8a7cc64..3553d2a 100755
--- a/app/app.py
+++ b/app/app.py
@@ -165,10 +165,10 @@ def create_app():
     add_routes(app)
     add_template_filters(app)
 
-    return app_manager
+    return app, app_manager
 
 
 # For usage when you directly call the script with python
 if __name__ == "__main__":
-    app_mgr = create_app()
+    app, app_mgr = create_app()
     app_mgr.run()
diff --git a/app/create_database.py b/app/create_database.py
index 58ed446..58250ea 100644
--- a/app/create_database.py
+++ b/app/create_database.py
@@ -4,7 +4,7 @@ import add_admins
 
 from app import create_app, db
 
-app_manager = create_app()
+app, app_manager = create_app()
 
 entry_sets = {
     "admins": add_admins.add,
diff --git a/app/passenger_wsgi.py b/app/passenger_wsgi.py
index 35d8c99..ea68999 100644
--- a/app/passenger_wsgi.py
+++ b/app/passenger_wsgi.py
@@ -20,7 +20,7 @@ sys.path.append(os.getcwd())
 # and the WSGI object to be called `application`
 from app import create_app
 
-application = create_app()
+application, appmgr = create_app()
 
 # For running on the server with passenger etc
 if __name__ == "__main__":