diff --git a/conf/type/__user/explorer/shadow b/conf/type/__user/explorer/shadow
index c75e36f4..a949ec51 100755
--- a/conf/type/__user/explorer/shadow
+++ b/conf/type/__user/explorer/shadow
@@ -22,6 +22,13 @@
 #
 
 name=$__object_id
+os="$($__explorer/os)"
+# Default to using shadow passwords
+database="shadow"
 
-getent shadow "$name" || true
+if [ "$os" = "freebsd" ]; then
+   database="passwd"
+fi
+
+getent "$database" "$name" || true
 
diff --git a/doc/changelog b/doc/changelog
index 9160a817..a70cdefe 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -7,6 +7,7 @@ Changelog
 2.0.14:
 	* Bugfix Type: __jail: Use correct variable (Jake Guffey)
 	* Change Type: __jail: Parameter jailbase now optional (Jake Guffey)
+	* Bugfix Type: __user: Use passwd database on FreeBSD (Jake Guffey)
 	* Bugfix Type: __start_on_boot: Do not change parameters
 	* Feature __user: Added support for BSDs (Sébastien Gross)
 	* New Type: __package_zypper