diff --git a/modules.d/90crypt/63-luks.rules b/modules.d/90crypt/63-luks.rules
index 6ee8f6b3..802ea062 100644
--- a/modules.d/90crypt/63-luks.rules
+++ b/modules.d/90crypt/63-luks.rules
@@ -5,7 +5,7 @@
 
 
 SUBSYSTEM!="block", GOTO="luks_end"
-ACTION!="add", GOTO="luks_end"
+ACTION!="add|change", GOTO="luks_end"
 
 KERNEL!="sr*", IMPORT{program}="vol_id --export $tempnode"
 ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="/bin/sh -c 'echo $env{DEVNAME} luks-$env{ID_FS_UUID} >>/cryptroot'"
diff --git a/modules.d/90crypt/cryptroot.sh b/modules.d/90crypt/cryptroot.sh
index 20429f1a..86e3bbfc 100755
--- a/modules.d/90crypt/cryptroot.sh
+++ b/modules.d/90crypt/cryptroot.sh
@@ -3,7 +3,8 @@
     udevadm control --stop-exec-queue
     while read cryptopts; do
        (   exec >/dev/console 2>&1 </dev/console
-           /sbin/cryptsetup luksOpen $cryptopts || emergency_shell
+	   set $cryptopts
+	   [ -b /dev/mapper/$2 ] || ( /sbin/cryptsetup luksOpen $cryptopts || emergency_shell )
        )
     done </cryptroot
     >/cryptroot