--- a/hcid/hcid.conf
+++ b/hcid/hcid.conf
@@ -12,7 +12,7 @@
 	#   auto - Use local PIN for incoming connections
 	#   user - Always ask user for a PIN
 	#
-	security user;
+	security auto;
 
 	# Pairing mode
 	#   none  - Pairing disabled
@@ -29,7 +29,7 @@
 	# Local device name
 	#   %d - device id
 	#   %h - host name
-	name "BlueZ (%d)";
+	name "%h";
 
 	# Local device class
 	class 0x000100;