diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99adca888517f470385f422cf3ef55ccb87ea642..c0f670ba0e3ae2656515b81b80b2146e352b1477 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ TBD
 - Use asyncio locks to limit upload handler race condition ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/907))
 - Fix static fonts not working on some browsers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/906))
 - Fix import directory cleanup was not pointing to the proper directory ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/918))
+- Fix survey not appearing on first login ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/917))
 ### Tweaks
 TBD
 ### Lang
diff --git a/main.py b/main.py
index 8d82d4d3aff161555cbfc8b3421ed541a5e8b8f6..a76f77e2dce89018f860b34032fa9de0d0ac1b0e 100644
--- a/main.py
+++ b/main.py
@@ -21,6 +21,7 @@ from app.classes.logging.log_formatter import JsonFormatter
 
 console = Console()
 helper = Helpers()
+first_login = False
 # Get the path our application is running on.
 if getattr(sys, "frozen", False):
     APPLICATION_PATH = os.path.dirname(sys.executable)
@@ -388,6 +389,7 @@ if __name__ == "__main__":
             f"through your router/firewall if you would like to be able "
             f"to access Crafty remotely."
         )
+        first_login = True
         PASSWORD = helper.create_pass()
         installer.default_settings(PASSWORD)
         with open(
@@ -426,6 +428,7 @@ if __name__ == "__main__":
     import_helper = ImportHelpers(helper, file_helper)
     controller = Controller(database, helper, file_helper, import_helper)
     controller.set_project_root(APPLICATION_PATH)
+    controller.first_login = first_login
     tasks_manager = TasksManager(helper, controller, file_helper)
     import3 = Import3(helper, controller)
     helper.migration_notifications = get_migration_notifications()