diff --git a/src/installation_progress_page/mod.rs b/src/installation_progress_page/mod.rs
index ef5689c..a2b2a4b 100644
--- a/src/installation_progress_page/mod.rs
+++ b/src/installation_progress_page/mod.rs
@@ -332,7 +332,7 @@ touch /tmp/PIKA_CRYPT/crypttab
                                     ),
                                     (
                                         "LUKS_PASSWD".to_string(),
-                                        p.as_str()
+                                        p.replace("'", r###""'""###).as_str()
                                     )
                                 ]),
                             )
diff --git a/src/manual_partitioning_page/func.rs b/src/manual_partitioning_page/func.rs
index 5371f45..e746b24 100644
--- a/src/manual_partitioning_page/func.rs
+++ b/src/manual_partitioning_page/func.rs
@@ -994,7 +994,7 @@ fn post_check_drive_mount(
         row,
         move |_| {
             if row.mountpoint() == "[SWAP]" {
-                if partition.part_fs == "linux-swap" {
+                if  partition.part_fs == "linux-swap" || partition.part_fs == "swap" {
                     (*partition_row_struct.swap_fs_error.borrow_mut()) = false;
                     if *partition_row_struct.never.borrow() == false
                         && *partition_row_struct.swap_fs_error.borrow() == false
diff --git a/src/manual_partitioning_page/mod.rs b/src/manual_partitioning_page/mod.rs
index 95f839b..a3e235c 100644
--- a/src/manual_partitioning_page/mod.rs
+++ b/src/manual_partitioning_page/mod.rs
@@ -167,6 +167,8 @@ pub fn manual_partitioning_page(
         #[strong]
         language_changed_action,
         #[strong]
+        partition_array_refcell,
+        #[strong]
         used_partition_array_refcell,
         #[strong]
         subvol_partition_array_refcell,
@@ -198,6 +200,7 @@ pub fn manual_partitioning_page(
             (*partition_method_manual_fstab_entry_array_refcell.borrow_mut()) = Vec::new();
             (*partition_method_manual_luks_enabled_refcell.borrow_mut()) = false;
             (*partition_method_manual_crypttab_entry_array_refcell.borrow_mut()) = Vec::new();
+            (*partition_array_refcell.borrow_mut()) = get_partitions();
             (*used_partition_array_refcell.borrow_mut()) = Vec::new();
             (*subvol_partition_array_refcell.borrow_mut()) = Vec::new();
             (*extra_mount_id_refcell.borrow_mut()) = 3;