diff --git a/modules/02-create-filevault-user.sh b/modules/02-create-filevault-user.sh
index 999b27e..c24224a 100755
--- a/modules/02-create-filevault-user.sh
+++ b/modules/02-create-filevault-user.sh
@@ -1,7 +1,14 @@
 #!/usr/bin/env zsh
 
-function getDefaultFullname() {
+function getComputerName() {
+  local moduleAnswer
   local computerName="`scutil --get ComputerName 2> /dev/null`"
+  getModuleAnswerByKeyRegEx '_hostname$' && computerName=$moduleAnswer
+  print -- $computerName
+}
+
+function getDefaultFullname() {
+  local computerName="`getComputerName`"
   lop -- -d 'Default full name based on current computer name is:' -d "$computerName"
   print "${computerName}"
 }
diff --git a/modules/lib.sh b/modules/lib.sh
index 56ca245..fe035cd 100644
--- a/modules/lib.sh
+++ b/modules/lib.sh
@@ -14,6 +14,15 @@ function configureLogging() {
   lop setoutput -l ${level} ${output}
 }
 
+function getModuleAnswerByKeyRegEx() {
+  local key value
+  local searchRegEx=$1
+  for key moduleAnswer in ${modkey:^modans}; do
+    [[ $key =~ $searchRegEx ]] && return 0
+  done
+  return 1
+}
+
 function checkCommands() {
   local cmd
   for cmd in ${(k)cmds}; do