diff --git a/configure.sh b/configure.sh
index 518e5e6fd9aeb7708ca92646a3c55efae891ada7..f7e239be7fcea3a7cfe426e8da2e9d909514cee7 100755
--- a/configure.sh
+++ b/configure.sh
@@ -83,25 +83,25 @@ else
 	echo
 	echo
 	echo
-	echo "Please provide following parameters for first socctolls user which will be created during the initialization with organization admin privileges:"
+	echo "Please provide the following parameters for the first SOCTools user, which will be created during the initialization with organization admin privileges:"
+	echo "username 	- Username of the user"
 	echo "firstname - First name of the user"
 	echo "lastname 	- Last name of the user"
-	echo "username 	- Username of the user"
-	echo "DN 	- Distinguished Name of the user, for user certificate"
-	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"
+	#echo "DN 	- Distinguished Name of the user, for user certificate"
+	#echo "CN 	- Common Name of the user, for user certificate"
+	echo "Email will be generated automatically in Username@Domain format because of format restrictions in some services"
 	echo ""
-	echo ""
-	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 CN for Certificate [${firstname}${lastname}]: " CN
-	CN=${CN:-${firstname}${lastname}}
-	DN=${CN}
+	read -p "username: " username
+	if [ -z "$username" ]; then
+		echo "Error: Empty username! exiting..."
+		exit 1
+  fi
+	read -p "firstname: " firstname
+	read -p "lastname: " lastname
+	#read -p "Enter CN for Certificate [${firstname}${lastname}]: " CN
+	#CN=${CN:-${firstname}${lastname}}
+	CN="$username"
+	DN="CN=${CN}"
 	echo
 	echo
 	echo
@@ -124,12 +124,12 @@ else
 			cp -f group_vars/all/variables.template group_vars/all/variables.yml
 			sed -i "s/CHANGE_ME_TO_FQDN/${soctoolsproxy}/g" group_vars/all/variables.yml
 			sed -i "s/soctools.test/${domain}/g" group_vars/all/variables.yml
-			sed -i "11s/soc_admin/${firstname}/" group_vars/all/variables.yml
-			sed -i "12s/SOC/${lastname}/" group_vars/all/variables.yml
+			sed -i "11s/CHANGE_ME_FIRST_NAME/${firstname}/" group_vars/all/variables.yml
+			sed -i "12s/CHANGE_ME_LAST_NAME/${lastname}/" group_vars/all/variables.yml
 			sed -i "13s/soc_admin/${username}/" group_vars/all/variables.yml
 			sed -i "14s/soc_admin/${username}/" group_vars/all/variables.yml
-			sed -i "15s/SOC_Admin/${DN}/" group_vars/all/variables.yml
-			sed -i "16s/SOC_Admin/${CN}/" group_vars/all/variables.yml
+			sed -i "15s/CN=soc_admin/${DN}/" group_vars/all/variables.yml
+			sed -i "16s/soc_admin/${CN}/" group_vars/all/variables.yml
 			sed -i "26s/soc_admin/${username}/" group_vars/all/variables.yml
 			echo
 			echo
diff --git a/group_vars/all/variables.template b/group_vars/all/variables.template
index ed0178a7249d1afc7c1f64af3ab87c9c5b164a18..04576f39a7e109c393776ab21dbd7a25330655b1 100644
--- a/group_vars/all/variables.template
+++ b/group_vars/all/variables.template
@@ -8,18 +8,18 @@ domain: "soctools.test"
 
 #List of users which will be created during the initialization with organization admin privileges
 soctools_users:
-  - firstname: "soc_admin"
-    lastname: "SOC"
+  - firstname: "CHANGE_ME_FIRST_NAME"
+    lastname: "CHANGE_ME_LAST_NAME"
     username: "soc_admin"
     email: "soc_admin@{{domain}}"
-    DN: "CN=SOC_Admin"
-    CN: "SOC_Admin"
-#  - firstname: "soc_admin_2"
-#    lastname: "SOC"
+    DN: "CN=soc_admin"
+    CN: "soc_admin"
+#  - firstname: "SOC Admin 2"
+#    lastname: ""
 #    username: "soc_admin_2"
 #    email: "soc_admin_2@{{domain}}"
-#    DN: "CN=SOC_Admin_2"
-#    CN: "SOC_Admin_2"
+#    DN: "CN=soc_admin_2"
+#    CN: "soc_admin_2"
     
 # list of users(username) from previous step which will recive admin roles in ODFE. (Minimum one user is required)
 ODFE_ADMIN_USERS: