diff --git a/po/de.po b/po/de.po
index aa17911..48fc60f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_panic 0.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/pampanic/pam_panic\n"
-"POT-Creation-Date: 2018-10-03 20:26+0200\n"
+"POT-Creation-Date: 2018-10-29 18:49+0100\n"
 "PO-Revision-Date: 2018-09-20 21:03+0200\n"
 "Last-Translator:  <bandie@chaospott.de>\n"
 "Language-Team: German\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "CRITICAL: Problem with regcomp."
 msgstr "CRITICAL: Problem mit regcomp."
 
-#: src/pam_panic/pam_panic.c:122
+#: src/pam_panic/pam_panic.c:141
 msgid ""
 "ERROR: Arguments invalid. Note that \"allow\" and \"reject\" must have a "
 "valid GPT UUID."
@@ -30,7 +30,7 @@ msgstr ""
 "ERROR: Argument ungültig. Hinweis: \"allow\" und \"reject\" müssen eine "
 "valide GPT UUID aufweisen."
 
-#: src/pam_panic/pam_panic.c:158
+#: src/pam_panic/pam_panic.c:177
 msgid "ALERT for argument \"serious\": Device doesn't exist."
 msgstr "ALERT für Argument \"serious\": Gerät existiert nicht."
 
diff --git a/po/es.po b/po/es.po
index ffb5104..e9dc70f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_panic 0.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/pampanic/pam_panic\n"
-"POT-Creation-Date: 2018-10-03 20:26+0200\n"
+"POT-Creation-Date: 2018-10-29 18:49+0100\n"
 "PO-Revision-Date: 2018-09-29 18:19+0200\n"
 "Last-Translator: Dangered wolf <d@ngeredwolf.me>\n"
 "Language-Team: Spanish\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "CRITICAL: Problem with regcomp."
 msgstr "CRITICAL: Problema con regcomp."
 
-#: src/pam_panic/pam_panic.c:122
+#: src/pam_panic/pam_panic.c:141
 msgid ""
 "ERROR: Arguments invalid. Note that \"allow\" and \"reject\" must have a "
 "valid GPT UUID."
@@ -31,7 +31,7 @@ msgstr ""
 "ERROR: Argumentos inválidos. Tenga en cuenta que \"allow\" y \"reject\" "
 "deben tener un UUID de GPT válido."
 
-#: src/pam_panic/pam_panic.c:158
+#: src/pam_panic/pam_panic.c:177
 msgid "ALERT for argument \"serious\": Device doesn't exist."
 msgstr "ALERT para el argumento \"serious\": El dispositivo no existe."
 
diff --git a/po/fr.po b/po/fr.po
index a36ea82..de6506d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_panic 0.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/pampanic/pam_panic\n"
-"POT-Creation-Date: 2018-10-03 20:26+0200\n"
+"POT-Creation-Date: 2018-10-29 18:49+0100\n"
 "PO-Revision-Date: 2018-09-29 18:33+0200\n"
 "Last-Translator: Dashie <dashie@otter.sh>\n"
 "Language-Team: French\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "CRITICAL: Problem with regcomp."
 msgstr "CRITICAL: Problème avec regcomp."
 
-#: src/pam_panic/pam_panic.c:122
+#: src/pam_panic/pam_panic.c:141
 msgid ""
 "ERROR: Arguments invalid. Note that \"allow\" and \"reject\" must have a "
 "valid GPT UUID."
@@ -30,7 +30,7 @@ msgstr ""
 "ERROR: Arguments invalides. Notez que \"allow\" et \"reject\" doivent avoir "
 "un GPU UUID valide."
 
-#: src/pam_panic/pam_panic.c:158
+#: src/pam_panic/pam_panic.c:177
 msgid "ALERT for argument \"serious\": Device doesn't exist."
 msgstr "ALERT pour l'argument \"serious\": Le périphérique n'existe pas."
 
diff --git a/po/ja.po b/po/ja.po
index 6ec5fd7..572172d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_panic 0.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/pampanic/pam_panic\n"
-"POT-Creation-Date: 2018-10-03 20:26+0200\n"
+"POT-Creation-Date: 2018-10-29 18:49+0100\n"
 "PO-Revision-Date: 2018-09-29 18:51+0200\n"
 "Last-Translator: Chromium Neptune <chromium@neplanet.com>\n"
 "Language-Team: Japanese\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "CRITICAL: Problem with regcomp."
 msgstr "クリティカル： \"regcomp\"の問題"
 
-#: src/pam_panic/pam_panic.c:122
+#: src/pam_panic/pam_panic.c:141
 msgid ""
 "ERROR: Arguments invalid. Note that \"allow\" and \"reject\" must have a "
 "valid GPT UUID."
@@ -30,7 +30,7 @@ msgstr ""
 "エラー： 引き数が無効です。 \"allow\"と \"reject\"には有効なGPT UUIDが必要で"
 "す。"
 
-#: src/pam_panic/pam_panic.c:158
+#: src/pam_panic/pam_panic.c:177
 msgid "ALERT for argument \"serious\": Device doesn't exist."
 msgstr "引数 \"serious\"のアラート：デバイスが存在しません。"
 
diff --git a/po/pam_panic.pot b/po/pam_panic.pot
index ced7dec..4d80889 100644
--- a/po/pam_panic.pot
+++ b/po/pam_panic.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_panic 0.2.0\n"
 "Report-Msgid-Bugs-To: https://github.com/pampanic/pam_panic\n"
-"POT-Creation-Date: 2018-10-03 20:26+0200\n"
+"POT-Creation-Date: 2018-10-29 18:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,13 +21,13 @@ msgstr ""
 msgid "CRITICAL: Problem with regcomp."
 msgstr ""
 
-#: src/pam_panic/pam_panic.c:122
+#: src/pam_panic/pam_panic.c:141
 msgid ""
 "ERROR: Arguments invalid. Note that \"allow\" and \"reject\" must have a "
 "valid GPT UUID."
 msgstr ""
 
-#: src/pam_panic/pam_panic.c:158
+#: src/pam_panic/pam_panic.c:177
 msgid "ALERT for argument \"serious\": Device doesn't exist."
 msgstr ""
 
diff --git a/po4a/de.po b/po4a/de.po
index 87ec98a..61e9a4c 100644
--- a/po4a/de.po
+++ b/po4a/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po 4a\n"
 "Report-Msgid-Bugs-To: Bandie <bandie@chaospott.de>\n"
-"POT-Creation-Date: 2018-09-29 16:00+0200\n"
+"POT-Creation-Date: 2018-10-29 18:54+0100\n"
 "PO-Revision-Date: 2018-09-29 16:02+0200\n"
 "Last-Translator: Bandie <bandie@chaospott.de>\n"
 "Language-Team: German\n"
@@ -352,91 +352,94 @@ msgid "HOW TO DETERMINE MY UUIDS"
 msgstr "WIE BESTIMME ICH MEINE UUIDS"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:160
+#: ../src/pam_panic/man/man8/pam_panic.8:161
 msgid ""
 "You will find your UUIDs in I</dev/disk/by-partuuid>.  You might want to "
 "execute \"B<ls -l /dev/disk/by-partuuid/>\" in your favourite shell to find "
-"out which UUID is which device."
+"out which UUID is which device.  If I</dev/disk/by-partuuid> is not "
+"existent, you can use the ID from I</dev/disk/by-uuid> or I</dev/disk/by-id>."
 msgstr ""
 "Die UUIDs können unter I</dev/disk/by-partuuid> gefunden werden. Um "
 "nachvollziehen zu können, welcher Wecheldatenträger welches ist, ist es "
-"ratsam \"B<ls -l /dev/disk/by-partuuid/>\" in der Lieblingsshell auszuführen."
+"ratsam \"B<ls -l /dev/disk/by-partuuid/>\" in der Lieblingsshell "
+"auszuführen. Wenn I</dev/disk/by-partuuid> nicht existiert, kann die ID von "
+"I</dev/disk/by-uuid> oder I</dev/disk/by-id> benutzt werden."
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:162
+#: ../src/pam_panic/man/man8/pam_panic.8:163
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:41
 #, no-wrap
 msgid "RETURN VALUES"
 msgstr "RÜCKGABEWERTE"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:165
+#: ../src/pam_panic/man/man8/pam_panic.8:166
 msgid "PAM_SUCCESS"
 msgstr "PAM_SUCCESS"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:167
+#: ../src/pam_panic/man/man8/pam_panic.8:168
 msgid "Access was granted."
 msgstr "Zugriff wurde gewährt."
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:170
+#: ../src/pam_panic/man/man8/pam_panic.8:171
 msgid "PAM_IGNORE"
 msgstr "PAM_IGNORE"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:172
+#: ../src/pam_panic/man/man8/pam_panic.8:173
 msgid "An error has occured. The module will be ignored."
 msgstr "Ein Fehler ist aufgetreten. Dieses Modul wird ignoriert."
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:175
+#: ../src/pam_panic/man/man8/pam_panic.8:176
 msgid "PAM_MAXTRIES"
 msgstr "PAM_MAXTRIES"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:177
+#: ../src/pam_panic/man/man8/pam_panic.8:178
 msgid "The removable media was not detected."
 msgstr "Der Wechseldatenträger wurde nicht erkannt."
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:180
+#: ../src/pam_panic/man/man8/pam_panic.8:181
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:59
 #, no-wrap
 msgid "FILES"
 msgstr "DATEIEN"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:183
+#: ../src/pam_panic/man/man8/pam_panic.8:184
 msgid "__PAMPANICSO__"
 msgstr "__PAMPANICSO__"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:185
+#: ../src/pam_panic/man/man8/pam_panic.8:186
 msgid "This PAM module, which does everything of this above."
 msgstr "Dieses PAM-Modul, welches für alles zuständig ist."
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:188
+#: ../src/pam_panic/man/man8/pam_panic.8:189
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:62
 msgid "__PAMPANICPW__"
 msgstr "__PAMPANICPW__"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:190
+#: ../src/pam_panic/man/man8/pam_panic.8:191
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:64
 msgid "Program to set and change the passwords."
 msgstr "Programm zum Setzen und Verändern der Passwörter."
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:193
+#: ../src/pam_panic/man/man8/pam_panic.8:194
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:72
 #, no-wrap
 msgid "BUGS"
 msgstr "BUGS"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:196
+#: ../src/pam_panic/man/man8/pam_panic.8:197
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:75
 msgid ""
 "Please report bugs and send pull requests to E<lt>https://github.com/"
@@ -446,32 +449,32 @@ msgstr ""
 "eingereicht werden: E<lt>https://github.com/pampanic/pam_panicE<gt>."
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:198
+#: ../src/pam_panic/man/man8/pam_panic.8:199
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:77
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:204
+#: ../src/pam_panic/man/man8/pam_panic.8:205
 msgid "B<pam_panic_pw>(1), B<cryptsetup>(8), B<pam>(8), B<pam.conf>(5)"
 msgstr "B<pam_panic_pw>(1), B<cryptsetup>(8), B<pam>(8), B<pam.conf>(5)"
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:206
+#: ../src/pam_panic/man/man8/pam_panic.8:207
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:85
 #, no-wrap
 msgid "AUTHORS"
 msgstr "AUTOREN"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:210
+#: ../src/pam_panic/man/man8/pam_panic.8:211
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:90
 msgid "pam_panic was written by Bandie E<lt>bandie@chaospott.deE<gt>."
 msgstr "pam_panic wurde von Bandie E<lt>bandie@chaospott.deE<gt> entwickelt."
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:211
+#: ../src/pam_panic/man/man8/pam_panic.8:212
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:92
 msgid ""
 "This man page has been revised by Jordy Dickinson E<lt>jordy."
diff --git a/po4a/es.po b/po4a/es.po
index a67b54d..ad42301 100644
--- a/po4a/es.po
+++ b/po4a/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po 4a\n"
 "Report-Msgid-Bugs-To: Bandie <bandie@chaospott.de>\n"
-"POT-Creation-Date: 2018-09-29 16:00+0200\n"
+"POT-Creation-Date: 2018-10-29 18:54+0100\n"
 "PO-Revision-Date: 2018-09-29 16:02+0200\n"
 "Last-Translator: d@angeredwolf.me\n"
 "Language-Team: Spanish\n"
@@ -349,91 +349,93 @@ msgid "HOW TO DETERMINE MY UUIDS"
 msgstr "CÓMO DETERMINAR MIS UUIDS"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:160
+#: ../src/pam_panic/man/man8/pam_panic.8:161
 msgid ""
 "You will find your UUIDs in I</dev/disk/by-partuuid>.  You might want to "
 "execute \"B<ls -l /dev/disk/by-partuuid/>\" in your favourite shell to find "
-"out which UUID is which device."
+"out which UUID is which device.  If I</dev/disk/by-partuuid> is not "
+"existent, you can use the ID from I</dev/disk/by-uuid> or I</dev/disk/by-id>."
 msgstr ""
 "Se puede encontrar sus UUIDs en /dev/disk/by-partuuid.  Es posible que desee "
 "ejecutar «ls -l /dev/disk/by-partuuid» en su shell favorito para encontrar "
-"cuál UUID es su dispositivo."
+"cuál UUID es su dispositivo. Si I</dev/disk/by-partuuid> no existe, puede "
+"utilizar el ID de I</dev/disk/by-uuid> o I</dev/disk/by-id>."
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:162
+#: ../src/pam_panic/man/man8/pam_panic.8:163
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:41
 #, no-wrap
 msgid "RETURN VALUES"
 msgstr "VALORES DE RETORNO"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:165
+#: ../src/pam_panic/man/man8/pam_panic.8:166
 msgid "PAM_SUCCESS"
 msgstr "PAM_SUCCESS"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:167
+#: ../src/pam_panic/man/man8/pam_panic.8:168
 msgid "Access was granted."
 msgstr "Indica que acceso fue permitido."
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:170
+#: ../src/pam_panic/man/man8/pam_panic.8:171
 msgid "PAM_IGNORE"
 msgstr "PAM_IGNORE"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:172
+#: ../src/pam_panic/man/man8/pam_panic.8:173
 msgid "An error has occured. The module will be ignored."
 msgstr "Indica que se ha producido un error. El módulo estará ignorado."
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:175
+#: ../src/pam_panic/man/man8/pam_panic.8:176
 msgid "PAM_MAXTRIES"
 msgstr "PAM_MAXTRIES"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:177
+#: ../src/pam_panic/man/man8/pam_panic.8:178
 msgid "The removable media was not detected."
 msgstr "El media removible no fue detectados."
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:180
+#: ../src/pam_panic/man/man8/pam_panic.8:181
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:59
 #, no-wrap
 msgid "FILES"
 msgstr "ARCHIVOS"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:183
+#: ../src/pam_panic/man/man8/pam_panic.8:184
 msgid "__PAMPANICSO__"
 msgstr "__PAMPANICSO__"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:185
+#: ../src/pam_panic/man/man8/pam_panic.8:186
 msgid "This PAM module, which does everything of this above."
 msgstr "Este módulo PAM."
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:188
+#: ../src/pam_panic/man/man8/pam_panic.8:189
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:62
 msgid "__PAMPANICPW__"
 msgstr "__PAMPANICPW__"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:190
+#: ../src/pam_panic/man/man8/pam_panic.8:191
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:64
 msgid "Program to set and change the passwords."
 msgstr "Cambiador de contraseña."
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:193
+#: ../src/pam_panic/man/man8/pam_panic.8:194
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:72
 #, no-wrap
 msgid "BUGS"
 msgstr "ERRORES"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:196
+#: ../src/pam_panic/man/man8/pam_panic.8:197
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:75
 msgid ""
 "Please report bugs and send pull requests to E<lt>https://github.com/"
@@ -443,32 +445,32 @@ msgstr ""
 "pampanic/pam_panicE<gt>."
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:198
+#: ../src/pam_panic/man/man8/pam_panic.8:199
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:77
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VER TAMBIÉN"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:204
+#: ../src/pam_panic/man/man8/pam_panic.8:205
 msgid "B<pam_panic_pw>(1), B<cryptsetup>(8), B<pam>(8), B<pam.conf>(5)"
 msgstr "B<pam_panic_pw>(1), B<cryptsetup>(8), B<pam>(8), B<pam.conf>(5)"
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:206
+#: ../src/pam_panic/man/man8/pam_panic.8:207
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:85
 #, no-wrap
 msgid "AUTHORS"
 msgstr "AUTORES"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:210
+#: ../src/pam_panic/man/man8/pam_panic.8:211
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:90
 msgid "pam_panic was written by Bandie E<lt>bandie@chaospott.deE<gt>."
 msgstr "pam_panic fue escrito por Bandie E<lt>bandie@chaospott.deE<gt>."
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:211
+#: ../src/pam_panic/man/man8/pam_panic.8:212
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:92
 msgid ""
 "This man page has been revised by Jordy Dickinson E<lt>jordy."
diff --git a/po4a/fr.po b/po4a/fr.po
index 4b4596f..1ac8ed7 100644
--- a/po4a/fr.po
+++ b/po4a/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po 4a\n"
 "Report-Msgid-Bugs-To: Bandie <bandie@chaospott.de>\n"
-"POT-Creation-Date: 2018-09-29 16:00+0200\n"
+"POT-Creation-Date: 2018-10-29 18:54+0100\n"
 "PO-Revision-Date: 2018-09-29 16:01+0200\n"
 "Last-Translator: Dashie <dashie@otter.sh>\n"
 "Language-Team: French\n"
@@ -351,91 +351,94 @@ msgid "HOW TO DETERMINE MY UUIDS"
 msgstr "COMMENT DÉTERMINER MES UUIDS"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:160
+#: ../src/pam_panic/man/man8/pam_panic.8:161
 msgid ""
 "You will find your UUIDs in I</dev/disk/by-partuuid>.  You might want to "
 "execute \"B<ls -l /dev/disk/by-partuuid/>\" in your favourite shell to find "
-"out which UUID is which device."
+"out which UUID is which device.  If I</dev/disk/by-partuuid> is not "
+"existent, you can use the ID from I</dev/disk/by-uuid> or I</dev/disk/by-id>."
 msgstr ""
 "Vous trouverz vos UUIDs dans /dev/disk/by-partuuid.  Vous voudriez peut-être "
 "executer \"ls -l /dev/disk/by-partuuid/\" dans votre shell favoris pour "
-"trouver quel UUID correspond à quel périphérique."
+"trouver quel UUID correspond à quel périphérique. Si I</dev/disk/by-"
+"partuuid> n'existe pas, vous pouvez utiliser l'ID de I</dev/disk/by-uuid> ou "
+"I</dev/disk/by-id>. "
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:162
+#: ../src/pam_panic/man/man8/pam_panic.8:163
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:41
 #, no-wrap
 msgid "RETURN VALUES"
 msgstr "VALEURS DE RETOUR"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:165
+#: ../src/pam_panic/man/man8/pam_panic.8:166
 msgid "PAM_SUCCESS"
 msgstr "PAM_SUCCESS"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:167
+#: ../src/pam_panic/man/man8/pam_panic.8:168
 msgid "Access was granted."
 msgstr "Accès autorisé."
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:170
+#: ../src/pam_panic/man/man8/pam_panic.8:171
 msgid "PAM_IGNORE"
 msgstr "PAM_IGNORE"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:172
+#: ../src/pam_panic/man/man8/pam_panic.8:173
 msgid "An error has occured. The module will be ignored."
 msgstr "Une erreur est survenue. Le module sera ignoré."
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:175
+#: ../src/pam_panic/man/man8/pam_panic.8:176
 msgid "PAM_MAXTRIES"
 msgstr "PAM_MAXTRIES"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:177
+#: ../src/pam_panic/man/man8/pam_panic.8:178
 msgid "The removable media was not detected."
 msgstr "Le péripherique amovible n'a pas été détécté."
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:180
+#: ../src/pam_panic/man/man8/pam_panic.8:181
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:59
 #, no-wrap
 msgid "FILES"
 msgstr "FICHIERS"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:183
+#: ../src/pam_panic/man/man8/pam_panic.8:184
 msgid "__PAMPANICSO__"
 msgstr "__PAMPANICSO__"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:185
+#: ../src/pam_panic/man/man8/pam_panic.8:186
 msgid "This PAM module, which does everything of this above."
 msgstr "Ce module PAM."
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:188
+#: ../src/pam_panic/man/man8/pam_panic.8:189
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:62
 msgid "__PAMPANICPW__"
 msgstr "__PAMPANICPW__"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:190
+#: ../src/pam_panic/man/man8/pam_panic.8:191
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:64
 msgid "Program to set and change the passwords."
 msgstr "Programme pour configurer les mots de passe."
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:193
+#: ../src/pam_panic/man/man8/pam_panic.8:194
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:72
 #, no-wrap
 msgid "BUGS"
 msgstr "BUGS"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:196
+#: ../src/pam_panic/man/man8/pam_panic.8:197
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:75
 msgid ""
 "Please report bugs and send pull requests to E<lt>https://github.com/"
@@ -445,32 +448,32 @@ msgstr ""
 "E<lt>https://github.com/pampanic/pam_panicE<gt>."
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:198
+#: ../src/pam_panic/man/man8/pam_panic.8:199
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:77
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:204
+#: ../src/pam_panic/man/man8/pam_panic.8:205
 msgid "B<pam_panic_pw>(1), B<cryptsetup>(8), B<pam>(8), B<pam.conf>(5)"
 msgstr "B<pam_panic_pw>(1), B<cryptsetup>(8), B<pam>(8), B<pam.conf>(5)"
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:206
+#: ../src/pam_panic/man/man8/pam_panic.8:207
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:85
 #, no-wrap
 msgid "AUTHORS"
 msgstr "AUTEURS"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:210
+#: ../src/pam_panic/man/man8/pam_panic.8:211
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:90
 msgid "pam_panic was written by Bandie E<lt>bandie@chaospott.deE<gt>."
 msgstr "pam_panic à été écris par Bandie E<lt>bandie@chaospott.deE<gt>."
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:211
+#: ../src/pam_panic/man/man8/pam_panic.8:212
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:92
 msgid ""
 "This man page has been revised by Jordy Dickinson E<lt>jordy."
diff --git a/po4a/ja.po b/po4a/ja.po
index c168f84..d5a2460 100644
--- a/po4a/ja.po
+++ b/po4a/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_panic 0.2.0\n"
 "Report-Msgid-Bugs-To: Bandie <bandie@chaospott.de>\n"
-"POT-Creation-Date: 2018-09-29 16:00+0200\n"
+"POT-Creation-Date: 2018-10-29 18:54+0100\n"
 "PO-Revision-Date: 2018-09-29 16:41+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -337,92 +337,94 @@ msgid "HOW TO DETERMINE MY UUIDS"
 msgstr "UUIDを調べる方法"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:160
+#: ../src/pam_panic/man/man8/pam_panic.8:161
 msgid ""
 "You will find your UUIDs in I</dev/disk/by-partuuid>.  You might want to "
 "execute \"B<ls -l /dev/disk/by-partuuid/>\" in your favourite shell to find "
-"out which UUID is which device."
+"out which UUID is which device.  If I</dev/disk/by-partuuid> is not "
+"existent, you can use the ID from I</dev/disk/by-uuid> or I</dev/disk/by-id>."
 msgstr ""
 "/dev/disk/by-partuuid でUUIDを調べることができます。 \"ls -l /dev/disk/by-"
 "partuuid/\"\n"
 "を任意のシェルで実行して、どのデバイスがどのUUIDかを調べる必要があるかもしれ"
-"ません。"
+"ません。 /dev/disk/by-partuuid が存在しない場合は、/dev/disk/by-uuid または /"
+"dev/disk/by-id のIDを使用できます。"
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:162
+#: ../src/pam_panic/man/man8/pam_panic.8:163
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:41
 #, no-wrap
 msgid "RETURN VALUES"
 msgstr "返り値"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:165
+#: ../src/pam_panic/man/man8/pam_panic.8:166
 msgid "PAM_SUCCESS"
 msgstr "PAM_SUCCESS"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:167
+#: ../src/pam_panic/man/man8/pam_panic.8:168
 msgid "Access was granted."
 msgstr "アクセスは許可されました。"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:170
+#: ../src/pam_panic/man/man8/pam_panic.8:171
 msgid "PAM_IGNORE"
 msgstr "PAM_IGNORE"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:172
+#: ../src/pam_panic/man/man8/pam_panic.8:173
 msgid "An error has occured. The module will be ignored."
 msgstr "エラーが発生しました。モジュールは無視されます。"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:175
+#: ../src/pam_panic/man/man8/pam_panic.8:176
 msgid "PAM_MAXTRIES"
 msgstr "PAM_MAXTRIES"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:177
+#: ../src/pam_panic/man/man8/pam_panic.8:178
 msgid "The removable media was not detected."
 msgstr "リムーバブルメディアが検知されませんでした。"
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:180
+#: ../src/pam_panic/man/man8/pam_panic.8:181
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:59
 #, no-wrap
 msgid "FILES"
 msgstr "ファイル"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:183
+#: ../src/pam_panic/man/man8/pam_panic.8:184
 msgid "__PAMPANICSO__"
 msgstr "__PAMPANICSO__"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:185
+#: ../src/pam_panic/man/man8/pam_panic.8:186
 msgid "This PAM module, which does everything of this above."
 msgstr "このPAMモジュールです。"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:188
+#: ../src/pam_panic/man/man8/pam_panic.8:189
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:62
 msgid "__PAMPANICPW__"
 msgstr "__PAMPANICPW__"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:190
+#: ../src/pam_panic/man/man8/pam_panic.8:191
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:64
 msgid "Program to set and change the passwords."
 msgstr "パスワードの設定および変更を行うためのプログラムです。"
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:193
+#: ../src/pam_panic/man/man8/pam_panic.8:194
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:72
 #, no-wrap
 msgid "BUGS"
 msgstr "バグ報告"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:196
+#: ../src/pam_panic/man/man8/pam_panic.8:197
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:75
 msgid ""
 "Please report bugs and send pull requests to E<lt>https://github.com/"
@@ -432,33 +434,33 @@ msgstr ""
 "トを行ってください。"
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:198
+#: ../src/pam_panic/man/man8/pam_panic.8:199
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:77
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:204
+#: ../src/pam_panic/man/man8/pam_panic.8:205
 msgid "B<pam_panic_pw>(1), B<cryptsetup>(8), B<pam>(8), B<pam.conf>(5)"
 msgstr "B<pam_panic_pw>(1), B<cryptsetup>(8), B<pam>(8), B<pam.conf>(5)"
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:206
+#: ../src/pam_panic/man/man8/pam_panic.8:207
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:85
 #, no-wrap
 msgid "AUTHORS"
 msgstr "著者"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:210
+#: ../src/pam_panic/man/man8/pam_panic.8:211
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:90
 msgid "pam_panic was written by Bandie E<lt>bandie@chaospott.deE<gt>."
 msgstr ""
 "pam_panic は Bandie E<lt>bandie@chaospott.deE<gt> によって作成されました。"
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:211
+#: ../src/pam_panic/man/man8/pam_panic.8:212
 #: ../src/pam_panic_pw/man/man1/pam_panic_pw.1:92
 msgid ""
 "This man page has been revised by Jordy Dickinson E<lt>jordy."
diff --git a/po4a/pam_panic.pot b/po4a/pam_panic.pot
index 69ce13d..052dca3 100644
--- a/po4a/pam_panic.pot
+++ b/po4a/pam_panic.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_panic 0.2.0\n"
 "Report-Msgid-Bugs-To: Bandie <bandie@chaospott.de>\n"
-"POT-Creation-Date: 2018-09-29 16:00+0200\n"
+"POT-Creation-Date: 2018-10-29 18:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -300,112 +300,114 @@ msgid "HOW TO DETERMINE MY UUIDS"
 msgstr ""
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:160
+#: ../src/pam_panic/man/man8/pam_panic.8:161
 msgid ""
 "You will find your UUIDs in I</dev/disk/by-partuuid>.  You might want to "
 "execute \"B<ls -l /dev/disk/by-partuuid/>\" in your favourite shell to find "
-"out which UUID is which device."
+"out which UUID is which device.  If I</dev/disk/by-partuuid> is not "
+"existent, you can use the ID from I</dev/disk/by-uuid> or "
+"I</dev/disk/by-id>."
 msgstr ""
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:162 ../src/pam_panic_pw/man/man1/pam_panic_pw.1:41
+#: ../src/pam_panic/man/man8/pam_panic.8:163 ../src/pam_panic_pw/man/man1/pam_panic_pw.1:41
 #, no-wrap
 msgid "RETURN VALUES"
 msgstr ""
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:165
+#: ../src/pam_panic/man/man8/pam_panic.8:166
 msgid "PAM_SUCCESS"
 msgstr ""
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:167
+#: ../src/pam_panic/man/man8/pam_panic.8:168
 msgid "Access was granted."
 msgstr ""
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:170
+#: ../src/pam_panic/man/man8/pam_panic.8:171
 msgid "PAM_IGNORE"
 msgstr ""
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:172
+#: ../src/pam_panic/man/man8/pam_panic.8:173
 msgid "An error has occured. The module will be ignored."
 msgstr ""
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:175
+#: ../src/pam_panic/man/man8/pam_panic.8:176
 msgid "PAM_MAXTRIES"
 msgstr ""
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:177
+#: ../src/pam_panic/man/man8/pam_panic.8:178
 msgid "The removable media was not detected."
 msgstr ""
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:180 ../src/pam_panic_pw/man/man1/pam_panic_pw.1:59
+#: ../src/pam_panic/man/man8/pam_panic.8:181 ../src/pam_panic_pw/man/man1/pam_panic_pw.1:59
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:183
+#: ../src/pam_panic/man/man8/pam_panic.8:184
 msgid "__PAMPANICSO__"
 msgstr ""
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:185
+#: ../src/pam_panic/man/man8/pam_panic.8:186
 msgid "This PAM module, which does everything of this above."
 msgstr ""
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:188 ../src/pam_panic_pw/man/man1/pam_panic_pw.1:62
+#: ../src/pam_panic/man/man8/pam_panic.8:189 ../src/pam_panic_pw/man/man1/pam_panic_pw.1:62
 msgid "__PAMPANICPW__"
 msgstr ""
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:190 ../src/pam_panic_pw/man/man1/pam_panic_pw.1:64
+#: ../src/pam_panic/man/man8/pam_panic.8:191 ../src/pam_panic_pw/man/man1/pam_panic_pw.1:64
 msgid "Program to set and change the passwords."
 msgstr ""
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:193 ../src/pam_panic_pw/man/man1/pam_panic_pw.1:72
+#: ../src/pam_panic/man/man8/pam_panic.8:194 ../src/pam_panic_pw/man/man1/pam_panic_pw.1:72
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:196 ../src/pam_panic_pw/man/man1/pam_panic_pw.1:75
+#: ../src/pam_panic/man/man8/pam_panic.8:197 ../src/pam_panic_pw/man/man1/pam_panic_pw.1:75
 msgid ""
 "Please report bugs and send pull requests to "
 "E<lt>https://github.com/pampanic/pam_panicE<gt>."
 msgstr ""
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:198 ../src/pam_panic_pw/man/man1/pam_panic_pw.1:77
+#: ../src/pam_panic/man/man8/pam_panic.8:199 ../src/pam_panic_pw/man/man1/pam_panic_pw.1:77
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:204
+#: ../src/pam_panic/man/man8/pam_panic.8:205
 msgid "B<pam_panic_pw>(1), B<cryptsetup>(8), B<pam>(8), B<pam.conf>(5)"
 msgstr ""
 
 #. type: SH
-#: ../src/pam_panic/man/man8/pam_panic.8:206 ../src/pam_panic_pw/man/man1/pam_panic_pw.1:85
+#: ../src/pam_panic/man/man8/pam_panic.8:207 ../src/pam_panic_pw/man/man1/pam_panic_pw.1:85
 #, no-wrap
 msgid "AUTHORS"
 msgstr ""
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:210 ../src/pam_panic_pw/man/man1/pam_panic_pw.1:90
+#: ../src/pam_panic/man/man8/pam_panic.8:211 ../src/pam_panic_pw/man/man1/pam_panic_pw.1:90
 msgid "pam_panic was written by Bandie E<lt>bandie@chaospott.deE<gt>."
 msgstr ""
 
 #. type: Plain text
-#: ../src/pam_panic/man/man8/pam_panic.8:211 ../src/pam_panic_pw/man/man1/pam_panic_pw.1:92
+#: ../src/pam_panic/man/man8/pam_panic.8:212 ../src/pam_panic_pw/man/man1/pam_panic_pw.1:92
 msgid ""
 "This man page has been revised by Jordy Dickinson "
 "E<lt>jordy.dickinson@icloud.comE<gt>."
diff --git a/src/pam_panic/man/man8/pam_panic.8 b/src/pam_panic/man/man8/pam_panic.8
index 1dc943b..4f7fd2f 100644
--- a/src/pam_panic/man/man8/pam_panic.8
+++ b/src/pam_panic/man/man8/pam_panic.8
@@ -157,6 +157,7 @@ account    requisite    __PAMPANICSO__
 .PP
 You will find your UUIDs in \fI/dev/disk/by-partuuid\fR.
 You might want to execute "\fBls -l /dev/disk/by-partuuid/\fR" in your favourite shell to find out which UUID is which device.
+If \fI/dev/disk/by-partuuid\fR is not existent, you can use the ID from \fI/dev/disk/by-uuid\fR or \fI/dev/disk/by-id\fR.
 
 
 .SH "RETURN VALUES"
diff --git a/src/pam_panic/pam_panic.c b/src/pam_panic/pam_panic.c
index 873c271..5ef5d5d 100644
--- a/src/pam_panic/pam_panic.c
+++ b/src/pam_panic/pam_panic.c
@@ -53,7 +53,26 @@ void argSplit(char **some_arg, char **some_temp, const char *arg){
 }
 
 void constrPath(char **dst, char **src){
-  sprintf(*dst, "/dev/disk/by-partuuid/%s", *src);
+
+  char tmp[256];
+
+  // EFI
+  strcpy(tmp, "/dev/disk/by-partuuid/");
+  strcat(tmp, *src);
+  if(access(tmp, F_OK) != -1)
+    sprintf(*dst, "/dev/disk/by-partuuid/%s", *src);
+ 
+  // MBR
+  memset(tmp, 0, sizeof tmp);
+  strcat(tmp, "/dev/disk/by-uuid/");
+  strcat(tmp, *src);
+  if(access(tmp, F_OK) != -1)
+    sprintf(*dst, "/dev/disk/by-uuid/%s", *src);
+
+  // Fallback vendor hardware id
+  else
+    sprintf(*dst, "/dev/disk/by-id/%s", *src);
+
 }
 
 PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags,	int argc, const char *argv[]){