diff --git a/src/freva_deployment/ui/deployment_tui/deploy_forms.py b/src/freva_deployment/ui/deployment_tui/deploy_forms.py
index 55a17385ae2561d0e040fadc6d9b89b46929500b..076fa0e122160ddc3cc21ac8457f032ce37bf192 100644
--- a/src/freva_deployment/ui/deployment_tui/deploy_forms.py
+++ b/src/freva_deployment/ui/deployment_tui/deploy_forms.py
@@ -744,6 +744,7 @@ class RunForm(npyscreen.FormMultiPageAction):
     def on_cancel(self) -> None:
         """Define what happens after the the cancel button is hit."""
         name = self.parentApp.current_form.lower()
+        self.parentApp.setup = {}
         for step, form_name in self.parentApp._steps_lookup.items():
             if name.startswith(step):
                 # Tell the MyTestApp object to change forms.
@@ -761,11 +762,14 @@ class RunForm(npyscreen.FormMultiPageAction):
     def _add_widgets(self) -> None:
         """Add the widgets to the form."""
 
+        project_name = self.parentApp.config.get(
+            "project_name", self.parentApp._read_cache("project_name", "")
+        )
         ssh_pw = self.parentApp._read_cache("ssh_pw", True)
         self.project_name = self.add_widget_intelligent(
             npyscreen.TitleText,
             name=f"{self.num}Set the name of the project",
-            value=self.parentApp._read_cache("project_name", ""),
+            value=project_name,
         )
         self.inventory_file = self.add_widget_intelligent(
             npyscreen.TitleFilename,
diff --git a/src/freva_deployment/ui/deployment_tui/main_window.py b/src/freva_deployment/ui/deployment_tui/main_window.py
index 7065fc1151870f4698bf09f14717825f3aea589f..6116966420da392a9fc65b306c4896e1a16fe4d9 100644
--- a/src/freva_deployment/ui/deployment_tui/main_window.py
+++ b/src/freva_deployment/ui/deployment_tui/main_window.py
@@ -228,6 +228,9 @@ class MainApp(npyscreen.NPSAppManaged):
 
     def read_cert_file(self, key: str) -> str:
         """Read the certificate file from the cache."""
+        cert_file = cast(str, self.config.get("certificates", {}).get(key, ""))
+        if cert_file:
+            return cert_file
         return cast(str, self._read_cache(key, ""))
 
     @property