diff --git a/configure.sh b/configure.sh
index 26650a7d14de6e6ab0d296ed0bc25b3b6b65e72b..ae4ea452a3a838ada26ce09ee88e16a2175ba36c 100755
--- a/configure.sh
+++ b/configure.sh
@@ -28,13 +28,17 @@ else
 	echo "CN 	- Common Name of the user, for user certificate"
 	echo "Email will be generated automatically in Username@Domain format becouse of format restrictions in some services"
 	sleep 10
-	for i in firstname lastname username DN CN; do
+	for i in firstname lastname username; do
 		read -p "${i}: " $i
 	      	if [ -z $i ]; then
                 	echo "Error: Empty string for ${i}! exiting..."
                 	exit 1
         	fi
 	done
+	read -p "Enter DN for Certificate [${firstname}${lastname}]: " DN
+	DN=${DN:-${firstname}${lastname}}
+	read -p "Enter CN for Certificate [${firstname}${lastname}]: " CN
+	CN=${CN:-${firstname}${lastname}}
 	echo
 	echo
 	echo