From 3b1c57eb079d3a40459cb68a188c037db6ad6e6c Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 00:16:44 +0530
Subject: [PATCH 01/32] feat: update acknowledgement.ftlh

---
 web/acknowledgement.ftlh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/web/acknowledgement.ftlh b/web/acknowledgement.ftlh
index aabba69..ff25b31 100644
--- a/web/acknowledgement.ftlh
+++ b/web/acknowledgement.ftlh
@@ -3,7 +3,11 @@
 <html lang="en">
 <head><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>Acknowledgement
 	</title><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tailwindcss@2.2/dist/tailwind.min.css" type="text/css"></head>
-<body>
+<body>[#ftl output_format="HTML"]
+
+
+
+
 
   
 	
@@ -45,6 +49,11 @@
   
   
   
+
+
+  
+  
+  
 </body>
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/i18next/2.0.22/i18next.min.js"></script><script src="./locale/loc-i18next.js"></script><script>

From 54d9deec60c3587bad23a73c85b8d6dc402bc42a Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 00:18:41 +0530
Subject: [PATCH 02/32] feat: update main.ftlh

---
 web/main.ftlh | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/web/main.ftlh b/web/main.ftlh
index 9dab200..efa9299 100644
--- a/web/main.ftlh
+++ b/web/main.ftlh
@@ -3,16 +3,11 @@
 <html lang="en">
 <head><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>Email Authentication
 	</title><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tailwindcss@2.2/dist/tailwind.min.css" type="text/css"></head>
-<body>
+<body>[#ftl output_format="HTML"]
+
+
+
 
-  
-	
-	
-	
-	
-	
-  
-  
 	<div id="content" class="md:h-screen bg-white relative flex flex-col justify-center items-center">
 	  <div class="md:border md:border-gray-300 bg-white md:shadow-lg shadow-none rounded p-10">
 		<div class="flex flex-col items-center space-y-3">
@@ -23,6 +18,10 @@
 		  <p data-i18n="main.enter_email" class="leading-normal">
 		  </p>
 		</div>
+		[#if errorMessage?has_content]
+		<p align="center" class="fs-6 text-red-600 mb-4">${errorMessage}
+		</p>
+		[/#if]
 		<form method="post" enctype="application/x-www-form-urlencoded" class="my-8">
 		  <input type="hidden" name="location" id="location" value="">
 		  <input type="hidden" name="device" id="device" value="">
@@ -46,6 +45,10 @@
   
   
   
+
+
+
+
 </body>
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/i18next/2.0.22/i18next.min.js"></script><script src="./locale/loc-i18next.js"></script><script>

From 164c50b07adf36338f6f8ef1c299f0c3d142a13c Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 00:19:53 +0530
Subject: [PATCH 03/32] feat: update otp.ftlh

---
 web/otp.ftlh | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/web/otp.ftlh b/web/otp.ftlh
index 8cef4e8..2cc63a9 100644
--- a/web/otp.ftlh
+++ b/web/otp.ftlh
@@ -3,7 +3,11 @@
 <html lang="en">
 <head><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>OTP Submission Form
 	</title><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tailwindcss@2.2/dist/tailwind.min.css" type="text/css"></head>
-<body>
+<body>[#ftl output_format="HTML"]
+
+
+
+
 
   
 	
@@ -29,8 +33,9 @@
 			<span class="i text-red-600">${email}</span>
 			[/#if]
 		  </p>
-		  [#if resent!false]
-		  <span data-i18n="otp.otp_resent_msg"></span>
+		  [#if resent]
+			<p align="center" data-i18n="otp.otp_resent_msg" class="fs-6 text-red-600 mb-4">
+			</p>
 		  [/#if]
 		  <div class="inline-flex items-center justify-center w-full">
 			<hr class="w-64 h-1 my-8 bg-gray-200 border-0 rounded dark:bg-gray-700">
@@ -38,8 +43,8 @@
 			</span>
 		  </div>
 		</div>
-		[#if !(matches!true)]
-		<p align="center" data-i18n="otp.incorrect_otp_entered" class="fs-6 text-danger mb-4">
+		[#if !matches]
+		<p align="center" data-i18n="otp.incorrect_otp_entered" class="fs-6 text-red-600 mb-4">
 		</p>
 		[/#if]
 		<form method="post" enctype="application/x-www-form-urlencoded" class="my-8">
@@ -68,7 +73,12 @@
   
   
   
+
+
+
+
 </body>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/i18next/2.0.22/i18next.min.js"></script><script src="./locale/loc-i18next.js"></script><script src="./locale/locale.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/i18next/2.0.22/i18next.min.js">
+</script><script src="./locale/loc-i18next.js"></script><script src="./locale/locale.js"></script>
 </html>
\ No newline at end of file

From ab3cfd8a340fce0d6cab525f751a419538b102f6 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 00:20:36 +0530
Subject: [PATCH 04/32] feat: update profile.ftlh

---
 web/profile.ftlh | 98 ++++++++++++++++++++++++++----------------------
 1 file changed, 53 insertions(+), 45 deletions(-)

diff --git a/web/profile.ftlh b/web/profile.ftlh
index 69d8556..e687c14 100644
--- a/web/profile.ftlh
+++ b/web/profile.ftlh
@@ -3,7 +3,11 @@
 <html lang="en">
 <head><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>Registration Form
 	</title><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tailwindcss@2.2/dist/tailwind.min.css" type="text/css"></head>
-<body>
+<body>[#ftl output_format="HTML"]
+
+
+
+
 
   
 	
@@ -27,47 +31,54 @@
 		  <div class="grid grid-cols-2 gap-2">
 		  </div>
 		  <div id="iyplr">
-			<div class="relative mb-4">
-			  <input type="text" name="givenName" id="givenName" value="${name!}" autocomplete="off" autofocus="" required="" class="w-full rounded px-3 border border-gray-300 pt-5 pb-2 focus:border-green-700 focus:ring-1 focus:ring-green-700 focus:outline-none input active:outline-none">
-			  <label for="givenName" data-i18n="profile.first_name" class="label absolute mt-2 ml-3 leading-tighter text-gray-600 text-base cursor-text">
-			  </label>
-			</div>
-			<div class="relative mb-4">
-			  <input type="text" name="sn" id="sn" autocomplete="off" required="" class="w-full rounded px-3 border border-gray-300 pt-5 pb-2 focus:border-green-700 focus:ring-1 focus:ring-green-700 focus:outline-none input active:outline-none">
-			  <label for="lastname" data-i18n="profile.last_name" class="label absolute mt-2 ml-3 leading-tighter text-gray-600 text-base cursor-text">
-			  </label>
-			</div>
-			<div class="relative mb-4">
-			  <input type="text" name="displayName" id="displayName" autocomplete="off" required="" class="w-full rounded px-3 border border-gray-300 pt-5 pb-2 focus:border-green-700 focus:ring-1 focus:ring-green-700 focus:outline-none input active:outline-none">
-			  <label for="lastname" data-i18n="profile.display_name" class="label absolute mt-2 ml-3 leading-tighter text-gray-600 text-base cursor-text">
-			  </label>
-			</div>
-			<div class="relative mb-4">
-			  <input type="text" name="o" id="o" autocomplete="off" class="w-full rounded px-3 border border-gray-300 pt-5 pb-2 focus:border-green-700 focus:ring-1 focus:ring-green-700 focus:outline-none input active:outline-none">
-			  <label for="company" data-i18n="profile.company" class="label absolute mt-2 ml-3 leading-tighter text-gray-600 text-base cursor-text">
-			  </label>
-			</div>
-			<div class="relative mb-4">
-			  <select type="text" id="c" name="c" class="w-full rounded px-3 border border-gray-300 pt-5 pb-2 focus:border-green-700 focus:ring-1 focus:ring-green-700 focus:outline-none input active:outline-none"><option>select...</option><option value="AF">Afghanistan</option><option value="AX">Aland Islands</option><option value="AL">Albania</option><option value="DZ">Algeria</option><option value="AS">American Samoa</option><option value="AD">Andorra</option><option value="AO">Angola</option><option value="AI">Anguilla</option><option value="AQ">Antarctica</option><option value="AG">Antigua and Barbuda</option><option value="AR">Argentina</option><option value="AM">Armenia</option><option value="AW">Aruba</option><option value="AU">Australia</option><option value="AT">Austria</option><option value="AZ">Azerbaijan</option><option value="BS">Bahamas</option><option value="BH">Bahrain</option><option value="BD">Bangladesh</option><option value="BB">Barbados</option><option value="BY">Belarus</option><option value="BE">Belgium</option><option value="BZ">Belize</option><option value="BJ">Benin</option><option value="BM">Bermuda</option><option value="BT">Bhutan</option><option value="BO">Bolivia</option><option value="BQ">Bonaire, Sint Eustatius and Saba</option><option value="BA">Bosnia and Herzegovina</option><option value="BW">Botswana</option><option value="BV">Bouvet Island</option><option value="BR">Brazil</option><option value="IO">British Indian Ocean Territory</option><option value="BN">Brunei Darussalam</option><option value="BG">Bulgaria</option><option value="BF">Burkina Faso</option><option value="BI">Burundi</option><option value="KH">Cambodia</option><option value="CM">Cameroon</option><option value="CA">Canada</option><option value="CV">Cape Verde</option><option value="KY">Cayman Islands</option><option value="CF">Central African Republic</option><option value="TD">Chad</option><option value="CL">Chile</option><option value="CN">China</option><option value="CX">Christmas Island</option><option value="CC">Cocos (Keeling) Islands</option><option value="CO">Colombia</option><option value="KM">Comoros</option><option value="CG">Congo</option><option value="CD">Congo, Democratic Republic of the Congo</option><option value="CK">Cook Islands</option><option value="CR">Costa Rica</option><option value="CI">Cote D'Ivoire</option><option value="HR">Croatia</option><option value="CU">Cuba</option><option value="CW">Curacao</option><option value="CY">Cyprus</option><option value="CZ">Czech Republic</option><option value="DK">Denmark</option><option value="DJ">Djibouti</option><option value="DM">Dominica</option><option value="DO">Dominican Republic</option><option value="EC">Ecuador</option><option value="EG">Egypt</option><option value="SV">El Salvador</option><option value="GQ">Equatorial Guinea</option><option value="ER">Eritrea</option><option value="EE">Estonia</option><option value="ET">Ethiopia</option><option value="FK">Falkland Islands (Malvinas)</option><option value="FO">Faroe Islands</option><option value="FJ">Fiji</option><option value="FI">Finland</option><option value="FR">France</option><option value="GF">French Guiana</option><option value="PF">French Polynesia</option><option value="TF">French Southern Territories</option><option value="GA">Gabon</option><option value="GM">Gambia</option><option value="GE">Georgia</option><option value="DE">Germany</option><option value="GH">Ghana</option><option value="GI">Gibraltar</option><option value="GR">Greece</option><option value="GL">Greenland</option><option value="GD">Grenada</option><option value="GP">Guadeloupe</option><option value="GU">Guam</option><option value="GT">Guatemala</option><option value="GG">Guernsey</option><option value="GN">Guinea</option><option value="GW">Guinea-Bissau</option><option value="GY">Guyana</option><option value="HT">Haiti</option><option value="HM">Heard Island and Mcdonald Islands</option><option value="VA">Holy See (Vatican City State)</option><option value="HN">Honduras</option><option value="HK">Hong Kong</option><option value="HU">Hungary</option><option value="IS">Iceland</option><option value="IN">India</option><option value="ID">Indonesia</option><option value="IR">Iran, Islamic Republic of</option><option value="IQ">Iraq</option><option value="IE">Ireland</option><option value="IM">Isle of Man</option><option value="IL">Israel</option><option value="IT">Italy</option><option value="JM">Jamaica</option><option value="JP">Japan</option><option value="JE">Jersey</option><option value="JO">Jordan</option><option value="KZ">Kazakhstan</option><option value="KE">Kenya</option><option value="KI">Kiribati</option><option value="KP">Korea, Democratic People's Republic of</option><option value="KR">Korea, Republic of</option><option value="XK">Kosovo</option><option value="KW">Kuwait</option><option value="KG">Kyrgyzstan</option><option value="LA">Lao People's Democratic Republic</option><option value="LV">Latvia</option><option value="LB">Lebanon</option><option value="LS">Lesotho</option><option value="LR">Liberia</option><option value="LY">Libyan Arab Jamahiriya</option><option value="LI">Liechtenstein</option><option value="LT">Lithuania</option><option value="LU">Luxembourg</option><option value="MO">Macao</option><option value="MK">Macedonia, the Former Yugoslav Republic of</option><option value="MG">Madagascar</option><option value="MW">Malawi</option><option value="MY">Malaysia</option><option value="MV">Maldives</option><option value="ML">Mali</option><option value="MT">Malta</option><option value="MH">Marshall Islands</option><option value="MQ">Martinique</option><option value="MR">Mauritania</option><option value="MU">Mauritius</option><option value="YT">Mayotte</option><option value="MX">Mexico</option><option value="FM">Micronesia, Federated States of</option><option value="MD">Moldova, Republic of</option><option value="MC">Monaco</option><option value="MN">Mongolia</option><option value="ME">Montenegro</option><option value="MS">Montserrat</option><option value="MA">Morocco</option><option value="MZ">Mozambique</option><option value="MM">Myanmar</option><option value="NA">Namibia</option><option value="NR">Nauru</option><option value="NP">Nepal</option><option value="NL">Netherlands</option><option value="AN">Netherlands Antilles</option><option value="NC">New Caledonia</option><option value="NZ">New Zealand</option><option value="NI">Nicaragua</option><option value="NE">Niger</option><option value="NG">Nigeria</option><option value="NU">Niue</option><option value="NF">Norfolk Island</option><option value="MP">Northern Mariana Islands</option><option value="NO">Norway</option><option value="OM">Oman</option><option value="PK">Pakistan</option><option value="PW">Palau</option><option value="PS">Palestinian Territory, Occupied</option><option value="PA">Panama</option><option value="PG">Papua New Guinea</option><option value="PY">Paraguay</option><option value="PE">Peru</option><option value="PH">Philippines</option><option value="PN">Pitcairn</option><option value="PL">Poland</option><option value="PT">Portugal</option><option value="PR">Puerto Rico</option><option value="QA">Qatar</option><option value="RE">Reunion</option><option value="RO">Romania</option><option value="RU">Russian Federation</option><option value="RW">Rwanda</option><option value="BL">Saint Barthelemy</option><option value="SH">Saint Helena</option><option value="KN">Saint Kitts and Nevis</option><option value="LC">Saint Lucia</option><option value="MF">Saint Martin</option><option value="PM">Saint Pierre and Miquelon</option><option value="VC">Saint Vincent and the Grenadines</option><option value="WS">Samoa</option><option value="SM">San Marino</option><option value="ST">Sao Tome and Principe</option><option value="SA">Saudi Arabia</option><option value="SN">Senegal</option><option value="RS">Serbia</option><option value="CS">Serbia and Montenegro</option><option value="SC">Seychelles</option><option value="SL">Sierra Leone</option><option value="SG">Singapore</option><option value="SX">Sint Maarten</option><option value="SK">Slovakia</option><option value="SI">Slovenia</option><option value="SB">Solomon Islands</option><option value="SO">Somalia</option><option value="ZA">South Africa</option><option value="GS">South Georgia and the South Sandwich Islands</option><option value="SS">South Sudan</option><option value="ES">Spain</option><option value="LK">Sri Lanka</option><option value="SD">Sudan</option><option value="SR">Suriname</option><option value="SJ">Svalbard and Jan Mayen</option><option value="SZ">Swaziland</option><option value="SE">Sweden</option><option value="CH">Switzerland</option><option value="SY">Syrian Arab Republic</option><option value="TW">Taiwan, Province of China</option><option value="TJ">Tajikistan</option><option value="TZ">Tanzania, United Republic of</option><option value="TH">Thailand</option><option value="TL">Timor-Leste</option><option value="TG">Togo</option><option value="TK">Tokelau</option><option value="TO">Tonga</option><option value="TT">Trinidad and Tobago</option><option value="TN">Tunisia</option><option value="TR">Turkey</option><option value="TM">Turkmenistan</option><option value="TC">Turks and Caicos Islands</option><option value="TV">Tuvalu</option><option value="UG">Uganda</option><option value="UA">Ukraine</option><option value="AE">United Arab Emirates</option><option value="GB">United Kingdom</option><option value="US" selected="">United States</option><option value="UM">United States Minor Outlying Islands</option><option value="UY">Uruguay</option><option value="UZ">Uzbekistan</option><option value="VU">Vanuatu</option><option value="VE">Venezuela</option><option value="VN">Viet Nam</option><option value="VG">Virgin Islands, British</option><option value="VI">Virgin Islands, U.s.</option><option value="WF">Wallis and Futuna</option><option value="EH">Western Sahara</option><option value="YE">Yemen</option><option value="ZM">Zambia</option><option value="ZW">Zimbabwe</option></select>
-			  <label for="country" data-i18n="profile.country" class="label absolute mt-2 ml-3 leading-tighter text-gray-600 text-base cursor-text">
-			  </label>
+		  <div class="relative mb-2">
+			<label for="givenName" data-i18n="profile.first_name" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
+			</label>
+			<input type="text" id="givenName" name="givenName" autofocus="" placeholder="John" value="${name!}" required="" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
+		  </div>
+		  <div class="relative mb-2">
+			<label for="lastname" data-i18n="profile.last_name" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
+			</label>
+			<input type="text" id="sn" name="sn" autofocus="" placeholder="Doe" required="" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
+		  </div>
+		  <div class="relative mb-2">
+			<label for="displayName" data-i18n="profile.display_name" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
+			</label>
+			<input type="text" id="displayName" name="displayName" autofocus="" placeholder="John" required="" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
+		  </div>	
+		  <div class="relative mb-2">
+			<label for="company" data-i18n="profile.company" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
+			</label>
+			<input type="text" id="o" name="o" autofocus="" placeholder="Company's Name" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
+		  </div>
+
+			<div class="relative mb-2">
+				<label for="country" data-i18n="profile.country" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
+				</label>
+			  <select type="text" id="c" name="c" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
+			  <option>select...</option><option value="AF">Afghanistan</option><option value="AX">Aland Islands</option><option value="AL">Albania</option><option value="DZ">Algeria</option><option value="AS">American Samoa</option><option value="AD">Andorra</option><option value="AO">Angola</option><option value="AI">Anguilla</option><option value="AQ">Antarctica</option><option value="AG">Antigua and Barbuda</option><option value="AR">Argentina</option><option value="AM">Armenia</option><option value="AW">Aruba</option><option value="AU">Australia</option><option value="AT">Austria</option><option value="AZ">Azerbaijan</option><option value="BS">Bahamas</option><option value="BH">Bahrain</option><option value="BD">Bangladesh</option><option value="BB">Barbados</option><option value="BY">Belarus</option><option value="BE">Belgium</option><option value="BZ">Belize</option><option value="BJ">Benin</option><option value="BM">Bermuda</option><option value="BT">Bhutan</option><option value="BO">Bolivia</option><option value="BQ">Bonaire, Sint Eustatius and Saba</option><option value="BA">Bosnia and Herzegovina</option><option value="BW">Botswana</option><option value="BV">Bouvet Island</option><option value="BR">Brazil</option><option value="IO">British Indian Ocean Territory</option><option value="BN">Brunei Darussalam</option><option value="BG">Bulgaria</option><option value="BF">Burkina Faso</option><option value="BI">Burundi</option><option value="KH">Cambodia</option><option value="CM">Cameroon</option><option value="CA">Canada</option><option value="CV">Cape Verde</option><option value="KY">Cayman Islands</option><option value="CF">Central African Republic</option><option value="TD">Chad</option><option value="CL">Chile</option><option value="CN">China</option><option value="CX">Christmas Island</option><option value="CC">Cocos (Keeling) Islands</option><option value="CO">Colombia</option><option value="KM">Comoros</option><option value="CG">Congo</option><option value="CD">Congo, Democratic Republic of the Congo</option><option value="CK">Cook Islands</option><option value="CR">Costa Rica</option><option value="CI">Cote D'Ivoire</option><option value="HR">Croatia</option><option value="CU">Cuba</option><option value="CW">Curacao</option><option value="CY">Cyprus</option><option value="CZ">Czech Republic</option><option value="DK">Denmark</option><option value="DJ">Djibouti</option><option value="DM">Dominica</option><option value="DO">Dominican Republic</option><option value="EC">Ecuador</option><option value="EG">Egypt</option><option value="SV">El Salvador</option><option value="GQ">Equatorial Guinea</option><option value="ER">Eritrea</option><option value="EE">Estonia</option><option value="ET">Ethiopia</option><option value="FK">Falkland Islands (Malvinas)</option><option value="FO">Faroe Islands</option><option value="FJ">Fiji</option><option value="FI">Finland</option><option value="FR">France</option><option value="GF">French Guiana</option><option value="PF">French Polynesia</option><option value="TF">French Southern Territories</option><option value="GA">Gabon</option><option value="GM">Gambia</option><option value="GE">Georgia</option><option value="DE">Germany</option><option value="GH">Ghana</option><option value="GI">Gibraltar</option><option value="GR">Greece</option><option value="GL">Greenland</option><option value="GD">Grenada</option><option value="GP">Guadeloupe</option><option value="GU">Guam</option><option value="GT">Guatemala</option><option value="GG">Guernsey</option><option value="GN">Guinea</option><option value="GW">Guinea-Bissau</option><option value="GY">Guyana</option><option value="HT">Haiti</option><option value="HM">Heard Island and Mcdonald Islands</option><option value="VA">Holy See (Vatican City State)</option><option value="HN">Honduras</option><option value="HK">Hong Kong</option><option value="HU">Hungary</option><option value="IS">Iceland</option><option value="IN">India</option><option value="ID">Indonesia</option><option value="IR">Iran, Islamic Republic of</option><option value="IQ">Iraq</option><option value="IE">Ireland</option><option value="IM">Isle of Man</option><option value="IL">Israel</option><option value="IT">Italy</option><option value="JM">Jamaica</option><option value="JP">Japan</option><option value="JE">Jersey</option><option value="JO">Jordan</option><option value="KZ">Kazakhstan</option><option value="KE">Kenya</option><option value="KI">Kiribati</option><option value="KP">Korea, Democratic People's Republic of</option><option value="KR">Korea, Republic of</option><option value="XK">Kosovo</option><option value="KW">Kuwait</option><option value="KG">Kyrgyzstan</option><option value="LA">Lao People's Democratic Republic</option><option value="LV">Latvia</option><option value="LB">Lebanon</option><option value="LS">Lesotho</option><option value="LR">Liberia</option><option value="LY">Libyan Arab Jamahiriya</option><option value="LI">Liechtenstein</option><option value="LT">Lithuania</option><option value="LU">Luxembourg</option><option value="MO">Macao</option><option value="MK">Macedonia, the Former Yugoslav Republic of</option><option value="MG">Madagascar</option><option value="MW">Malawi</option><option value="MY">Malaysia</option><option value="MV">Maldives</option><option value="ML">Mali</option><option value="MT">Malta</option><option value="MH">Marshall Islands</option><option value="MQ">Martinique</option><option value="MR">Mauritania</option><option value="MU">Mauritius</option><option value="YT">Mayotte</option><option value="MX">Mexico</option><option value="FM">Micronesia, Federated States of</option><option value="MD">Moldova, Republic of</option><option value="MC">Monaco</option><option value="MN">Mongolia</option><option value="ME">Montenegro</option><option value="MS">Montserrat</option><option value="MA">Morocco</option><option value="MZ">Mozambique</option><option value="MM">Myanmar</option><option value="NA">Namibia</option><option value="NR">Nauru</option><option value="NP">Nepal</option><option value="NL">Netherlands</option><option value="AN">Netherlands Antilles</option><option value="NC">New Caledonia</option><option value="NZ">New Zealand</option><option value="NI">Nicaragua</option><option value="NE">Niger</option><option value="NG">Nigeria</option><option value="NU">Niue</option><option value="NF">Norfolk Island</option><option value="MP">Northern Mariana Islands</option><option value="NO">Norway</option><option value="OM">Oman</option><option value="PK">Pakistan</option><option value="PW">Palau</option><option value="PS">Palestinian Territory, Occupied</option><option value="PA">Panama</option><option value="PG">Papua New Guinea</option><option value="PY">Paraguay</option><option value="PE">Peru</option><option value="PH">Philippines</option><option value="PN">Pitcairn</option><option value="PL">Poland</option><option value="PT">Portugal</option><option value="PR">Puerto Rico</option><option value="QA">Qatar</option><option value="RE">Reunion</option><option value="RO">Romania</option><option value="RU">Russian Federation</option><option value="RW">Rwanda</option><option value="BL">Saint Barthelemy</option><option value="SH">Saint Helena</option><option value="KN">Saint Kitts and Nevis</option><option value="LC">Saint Lucia</option><option value="MF">Saint Martin</option><option value="PM">Saint Pierre and Miquelon</option><option value="VC">Saint Vincent and the Grenadines</option><option value="WS">Samoa</option><option value="SM">San Marino</option><option value="ST">Sao Tome and Principe</option><option value="SA">Saudi Arabia</option><option value="SN">Senegal</option><option value="RS">Serbia</option><option value="CS">Serbia and Montenegro</option><option value="SC">Seychelles</option><option value="SL">Sierra Leone</option><option value="SG">Singapore</option><option value="SX">Sint Maarten</option><option value="SK">Slovakia</option><option value="SI">Slovenia</option><option value="SB">Solomon Islands</option><option value="SO">Somalia</option><option value="ZA">South Africa</option><option value="GS">South Georgia and the South Sandwich Islands</option><option value="SS">South Sudan</option><option value="ES">Spain</option><option value="LK">Sri Lanka</option><option value="SD">Sudan</option><option value="SR">Suriname</option><option value="SJ">Svalbard and Jan Mayen</option><option value="SZ">Swaziland</option><option value="SE">Sweden</option><option value="CH">Switzerland</option><option value="SY">Syrian Arab Republic</option><option value="TW">Taiwan, Province of China</option><option value="TJ">Tajikistan</option><option value="TZ">Tanzania, United Republic of</option><option value="TH">Thailand</option><option value="TL">Timor-Leste</option><option value="TG">Togo</option><option value="TK">Tokelau</option><option value="TO">Tonga</option><option value="TT">Trinidad and Tobago</option><option value="TN">Tunisia</option><option value="TR">Turkey</option><option value="TM">Turkmenistan</option><option value="TC">Turks and Caicos Islands</option><option value="TV">Tuvalu</option><option value="UG">Uganda</option><option value="UA">Ukraine</option><option value="AE">United Arab Emirates</option><option value="GB">United Kingdom</option><option value="US" selected="">United States</option><option value="UM">United States Minor Outlying Islands</option><option value="UY">Uruguay</option><option value="UZ">Uzbekistan</option><option value="VU">Vanuatu</option><option value="VE">Venezuela</option><option value="VN">Viet Nam</option><option value="VG">Virgin Islands, British</option><option value="VI">Virgin Islands, U.s.</option><option value="WF">Wallis and Futuna</option><option value="EH">Western Sahara</option><option value="YE">Yemen</option><option value="ZM">Zambia</option><option value="ZW">Zimbabwe</option></select>
 			</div>
-			<div class="relative mb-4">
-			  <input type="text" name="jansTitle" id="jansTitle" autocomplete="off" class="w-full rounded px-3 border border-gray-300 pt-5 pb-2 focus:border-green-700 focus:ring-1 focus:ring-green-700 focus:outline-none input active:outline-none">
-			  <label for="jansTitle" data-i18n="profile.job_title" class="label absolute mt-2 ml-3 leading-tighter text-gray-600 text-base cursor-text">
-			  </label>
+			<div class="relative mb-2">
+				<label for="jansTitle" data-i18n="profile.job_title" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
+				</label>
+				<input type="text" id="jansTitle" name="jansTitle" autofocus="" placeholder="Architect" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
 			</div>
-			<div class="relative mb-4">
-			  <select type="text" id="jansRole" name="jansRole" class="w-full rounded px-3 border border-gray-300 pt-5 pb-2 focus:border-green-700 focus:ring-1 focus:ring-green-700 focus:outline-none input active:outline-none"><option value="Architect" data-i18n="profile.architect"></option><option value="Developer" data-i18n="profile.developer"></option><option value="Researcher" data-i18n="profile.researcher"></option><option value="Student" data-i18n="profile.student"></option><option value="Other" data-i18n="profile.other"></option></select>
-			  <label for="occupation" data-i18n="profile.I_am_an" class="label absolute mt-2 ml-3 leading-tighter text-gray-600 text-base cursor-text">
-			  </label>
+			<div class="relative mb-2">
+				<label for="occupation" data-i18n="profile.I_am_an" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
+				</label>
+				<select id="jansRole" name="jansRole" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
+					<option value="Architect" data-i18n="profile.architect"></option>
+					<option value="Developer" data-i18n="profile.developer"></option>
+					<option value="Researcher" data-i18n="profile.researcher"></option>
+					<option value="Student" data-i18n="profile.student"></option>
+					<option value="Other" data-i18n="profile.other"></option>
+				</select>
 			</div>
-			<div class="space-y-9 mt-8">
-			  <div class="relative mb-4">
-				<input type="text" name="jansProfileURL" id="jansProfileURL" autocomplete="off" class="w-full rounded px-3 border border-gray-300 pt-5 pb-2 focus:border-green-700 focus:ring-1 focus:ring-green-700 focus:outline-none input active:outline-none">
-				<label for="jansProfileURL" data-i18n="profile.linkedin_url" class="label absolute mt-2 ml-3 leading-tighter text-gray-600 text-base cursor-text">
+		
+			<div class="relative mb-2">
+				<label for="jansProfileURL" data-i18n="profile.linkedin_url" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
 				</label>
-			  </div>
+				<input type="text" id="jansProfileURL" name="jansProfileURL" autofocus="" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
 			</div>
 			<div class="text-sm flex justify-center items-center">
 			  <button type="submit" data-callback="onSubmit" data-i18n="profile.submit" class="py-3 px-8 rounded text-white btn bg-green-500 hover:bg-green-600">
@@ -76,13 +87,10 @@
 		  </div>
 		</form>
 	  </div>
-	</div>
-  
-  
-  
-  
-  
-  
+  </div>
+
+
+
 </body>
 <style>
 	* {

From fcc013f0681947f6e554ea4540995a153356440b Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 11:18:23 +0530
Subject: [PATCH 05/32] feat: update main.ftlh

---
 web/main.ftlh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/web/main.ftlh b/web/main.ftlh
index efa9299..a682abb 100644
--- a/web/main.ftlh
+++ b/web/main.ftlh
@@ -3,11 +3,16 @@
 <html lang="en">
 <head><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>Email Authentication
 	</title><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tailwindcss@2.2/dist/tailwind.min.css" type="text/css"></head>
-<body>[#ftl output_format="HTML"]
-
-
-
+<body>
 
+  
+	
+	
+	
+	
+	
+  
+  
 	<div id="content" class="md:h-screen bg-white relative flex flex-col justify-center items-center">
 	  <div class="md:border md:border-gray-300 bg-white md:shadow-lg shadow-none rounded p-10">
 		<div class="flex flex-col items-center space-y-3">
@@ -19,8 +24,8 @@
 		  </p>
 		</div>
 		[#if errorMessage?has_content]
-		<p align="center" class="fs-6 text-red-600 mb-4">${errorMessage}
-		</p>
+		<div id="ig86l" class="fs-6 text-red-600 mb-4">${errorMessage}
+		</div>
 		[/#if]
 		<form method="post" enctype="application/x-www-form-urlencoded" class="my-8">
 		  <input type="hidden" name="location" id="location" value="">
@@ -45,10 +50,6 @@
   
   
   
-
-
-
-
 </body>
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/i18next/2.0.22/i18next.min.js"></script><script src="./locale/loc-i18next.js"></script><script>

From b5e2118c4f946d33e24719fac7632e81c31d8074 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 11:19:29 +0530
Subject: [PATCH 06/32] feat: update main.ftlh

---
 web/main.ftlh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/main.ftlh b/web/main.ftlh
index a682abb..4a15bc3 100644
--- a/web/main.ftlh
+++ b/web/main.ftlh
@@ -24,7 +24,7 @@
 		  </p>
 		</div>
 		[#if errorMessage?has_content]
-		<div id="ig86l" class="fs-6 text-red-600 mb-4">${errorMessage}
+		<div id="ig86l" class="fs-6 text-red-600 mb-4" align="center">${errorMessage}
 		</div>
 		[/#if]
 		<form method="post" enctype="application/x-www-form-urlencoded" class="my-8">

From 3c258903dbaf6c821c99fea9697bbddf73f4c142 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 11:22:15 +0530
Subject: [PATCH 07/32] feat: update otp.ftlh

---
 web/otp.ftlh | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/web/otp.ftlh b/web/otp.ftlh
index 2cc63a9..9d0a102 100644
--- a/web/otp.ftlh
+++ b/web/otp.ftlh
@@ -3,11 +3,7 @@
 <html lang="en">
 <head><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>OTP Submission Form
 	</title><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tailwindcss@2.2/dist/tailwind.min.css" type="text/css"></head>
-<body>[#ftl output_format="HTML"]
-
-
-
-
+<body>
 
   
 	
@@ -34,8 +30,8 @@
 			[/#if]
 		  </p>
 		  [#if resent]
-			<p align="center" data-i18n="otp.otp_resent_msg" class="fs-6 text-red-600 mb-4">
-			</p>
+		  <div id="ioa0o" align="center" data-i18n="otp.otp_resent_msg" class="fs-6 text-red-600 mb-4">
+		  </div>
 		  [/#if]
 		  <div class="inline-flex items-center justify-center w-full">
 			<hr class="w-64 h-1 my-8 bg-gray-200 border-0 rounded dark:bg-gray-700">
@@ -73,12 +69,8 @@
   
   
   
-
-
-
-
 </body>
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/i18next/2.0.22/i18next.min.js">
-</script><script src="./locale/loc-i18next.js"></script><script src="./locale/locale.js"></script>
+  </script><script src="./locale/loc-i18next.js"></script><script src="./locale/locale.js"></script>
 </html>
\ No newline at end of file

From 4c2b0833eab6004fbe5f92f2ea154aee0f7a0e31 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 11:25:04 +0530
Subject: [PATCH 08/32] feat: update otp.ftlh

---
 web/otp.ftlh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/otp.ftlh b/web/otp.ftlh
index 9d0a102..c1e43f6 100644
--- a/web/otp.ftlh
+++ b/web/otp.ftlh
@@ -19,7 +19,8 @@
 		  <div class="flex">
 			<img src="https://gluu.org/wp-content/uploads/2020/12/logo.png">
 		  </div>
-		  <span data-i18n="otp.otp_verification" class="text-2xl font-semi-bold leading-normal"></span>
+		  <div id="ix28u" data-i18n="otp.otp_verification" class="text-2xl font-semi-bold leading-normal">
+		  </div>
 		  [#assign exists = (accountExists!false)]
 		  <p class="fs-4 mb-5">
 			[#if exists]

From 1deedcd227cdc15019575315711e807c6cb21ee2 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 11:25:28 +0530
Subject: [PATCH 09/32] feat: update otp.ftlh

---
 web/otp.ftlh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/otp.ftlh b/web/otp.ftlh
index c1e43f6..b1c663c 100644
--- a/web/otp.ftlh
+++ b/web/otp.ftlh
@@ -19,7 +19,7 @@
 		  <div class="flex">
 			<img src="https://gluu.org/wp-content/uploads/2020/12/logo.png">
 		  </div>
-		  <div id="ix28u" data-i18n="otp.otp_verification" class="text-2xl font-semi-bold leading-normal">
+		  <div id="ix28u" data-i18n="otp.otp_verification" class="text-2xl font-semi-bold leading-normal">OTP
 		  </div>
 		  [#assign exists = (accountExists!false)]
 		  <p class="fs-4 mb-5">

From 28398a73161d6182f5f0c672587c4e4493133a65 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 11:25:51 +0530
Subject: [PATCH 10/32] feat: update otp.ftlh

---
 web/otp.ftlh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/otp.ftlh b/web/otp.ftlh
index b1c663c..c1e43f6 100644
--- a/web/otp.ftlh
+++ b/web/otp.ftlh
@@ -19,7 +19,7 @@
 		  <div class="flex">
 			<img src="https://gluu.org/wp-content/uploads/2020/12/logo.png">
 		  </div>
-		  <div id="ix28u" data-i18n="otp.otp_verification" class="text-2xl font-semi-bold leading-normal">OTP
+		  <div id="ix28u" data-i18n="otp.otp_verification" class="text-2xl font-semi-bold leading-normal">
 		  </div>
 		  [#assign exists = (accountExists!false)]
 		  <p class="fs-4 mb-5">

From c58dd9a684875a1fdc25cac3a6d2ee3a9d0c8de1 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 11:27:41 +0530
Subject: [PATCH 11/32] feat: update otp.ftlh

---
 web/otp.ftlh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/web/otp.ftlh b/web/otp.ftlh
index c1e43f6..bfe2622 100644
--- a/web/otp.ftlh
+++ b/web/otp.ftlh
@@ -22,14 +22,14 @@
 		  <div id="ix28u" data-i18n="otp.otp_verification" class="text-2xl font-semi-bold leading-normal">
 		  </div>
 		  [#assign exists = (accountExists!false)]
-		  <p class="fs-4 mb-5">
-			[#if exists]
-			<span data-i18n="otp.need_verification_msg" class="text-red-600"></span>
-			[#else]
-			<span data-i18n="otp.user_not_registered" class="text-red-600"></span>
-			<span class="i text-red-600">${email}</span>
-			[/#if]
-		  </p>
+		  <div id="ipvtc">
+		  [#if exists]
+		  <span data-i18n="otp.need_verification_msg" class="text-red-600"></span>
+		  [#else]
+		  <span data-i18n="otp.user_not_registered" class="text-red-600"></span>
+		  <span class="i text-red-600">${email}</span>
+		  [/#if]
+		 </div>
 		  [#if resent]
 		  <div id="ioa0o" align="center" data-i18n="otp.otp_resent_msg" class="fs-6 text-red-600 mb-4">
 		  </div>

From 5f22a9bd63338ace84abdec3ed0177086073c875 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 11:29:14 +0530
Subject: [PATCH 12/32] feat: update otp.ftlh

---
 web/otp.ftlh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/web/otp.ftlh b/web/otp.ftlh
index bfe2622..991bae6 100644
--- a/web/otp.ftlh
+++ b/web/otp.ftlh
@@ -23,13 +23,13 @@
 		  </div>
 		  [#assign exists = (accountExists!false)]
 		  <div id="ipvtc">
-		  [#if exists]
-		  <span data-i18n="otp.need_verification_msg" class="text-red-600"></span>
-		  [#else]
-		  <span data-i18n="otp.user_not_registered" class="text-red-600"></span>
-		  <span class="i text-red-600">${email}</span>
-		  [/#if]
-		 </div>
+			[#if exists]
+			<span data-i18n="otp.need_verification_msg" class="text-red-600"></span>
+			[#else]
+			<span data-i18n="otp.user_not_registered" class="text-red-600"></span>
+			<span class="i text-red-600">${email}</span>
+			[/#if]
+		  </div>
 		  [#if resent]
 		  <div id="ioa0o" align="center" data-i18n="otp.otp_resent_msg" class="fs-6 text-red-600 mb-4">
 		  </div>
@@ -41,8 +41,8 @@
 		  </div>
 		</div>
 		[#if !matches]
-		<p align="center" data-i18n="otp.incorrect_otp_entered" class="fs-6 text-red-600 mb-4">
-		</p>
+		<div id="ixi4i" align="center" data-i18n="otp.incorrect_otp_entered" class="fs-6 text-red-600 mb-4">
+		</div>
 		[/#if]
 		<form method="post" enctype="application/x-www-form-urlencoded" class="my-8">
 		  <div class="relative mb-2">

From 6f0f1706cc6a29181f3938a718e5da3686112fc2 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 12:19:12 +0530
Subject: [PATCH 13/32] feat: update project.json


From 847613c9879976c5dbac698c3d15fb167328acb4 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 12:19:15 +0530
Subject: [PATCH 14/32] feat: update org.gluu.agama.smtp.main.json

---
 code/org.gluu.agama.smtp.main.json | 2114 +++++++---------------------
 1 file changed, 517 insertions(+), 1597 deletions(-)

diff --git a/code/org.gluu.agama.smtp.main.json b/code/org.gluu.agama.smtp.main.json
index 3f520c7..fb971d6 100644
--- a/code/org.gluu.agama.smtp.main.json
+++ b/code/org.gluu.agama.smtp.main.json
@@ -1,1513 +1,745 @@
 {
 	"nodes": [
 		{
-			"width": 270,
-			"height": 81,
-			"id": "Agama-note-ecf2fe6f-765d-4d6a-b6a2-3e91b59630fc",
+			"width": 170,
+			"height": 124,
+			"id": "Agama-assignment-Node-69595972-81e8-44bd-a12e-841bc5f0dafc",
 			"position": {
-				"x": 3054.57865528289,
-				"y": 823.0108923035444
+				"x": 1844,
+				"y": 494
 			},
-			"type": "notes",
+			"type": "assignment",
 			"data": {
-				"id": "Agama-note-ecf2fe6f-765d-4d6a-b6a2-3e91b59630fc",
-				"type": "Agama-note",
-				"notes": "Show UI with successful user registration message. If the user clicks on continue button then finish the registration flow successfully.",
+				"id": "Agama-assignment-Node-69595972-81e8-44bd-a12e-841bc5f0dafc",
+				"type": "Agama-assignment-Node",
+				"parentId": "Agama-trigger-Node-8b98ffa4-8732-46cf-8bda-6f922379414c",
+				"whenCondition": "",
+				"inRepeatBlock": true,
 				"position": {
-					"x": 3054.57865528289,
-					"y": 823.0108923035444
+					"x": 1844,
+					"y": 494
 				},
-				"skake": false
+				"agamaData": {
+					"id": "Agama-assignment-Node-69595972-81e8-44bd-a12e-841bc5f0dafc",
+					"parentId": "Agama-trigger-Node-8b98ffa4-8732-46cf-8bda-6f922379414c",
+					"type": "Agama-assignment-Node",
+					"displayName": "",
+					"hasComment": true,
+					"comment": "Reset error message to empty after email verification",
+					"whenCondition": "",
+					"inRepeatBlock": true,
+					"assignments": [
+						{
+							"variableTypeCheck": false,
+							"assignmentExpression": "\"\"",
+							"assignedVariableName": "emailObj.errorMessage"
+						}
+					],
+					"nodeIcon": "material-symbols:equal"
+				}
 			},
 			"selected": true,
+			"dragging": false,
 			"positionAbsolute": {
-				"x": 3054.57865528289,
-				"y": 823.0108923035444
-			},
-			"dragging": false
+				"x": 1844,
+				"y": 494
+			}
 		},
 		{
-			"width": 270,
-			"height": 42,
-			"id": "Agama-note-f4af61a8-27c5-4569-b47c-ba193d77fc2c",
+			"width": 170,
+			"height": 124,
+			"id": "Agama-trigger-Node-8b98ffa4-8732-46cf-8bda-6f922379414c",
 			"position": {
-				"x": 2430.8354485195,
-				"y": 807.9291153335856
+				"x": 1644,
+				"y": 494
 			},
-			"type": "notes",
+			"type": "trigger",
 			"data": {
-				"id": "Agama-note-f4af61a8-27c5-4569-b47c-ba193d77fc2c",
-				"type": "Agama-note",
-				"notes": "New User registration is successful.",
+				"id": "Agama-trigger-Node-8b98ffa4-8732-46cf-8bda-6f922379414c",
+				"type": "Agama-trigger-Node",
+				"parentId": "Agama-when-Node-2493baf6-a7d6-4f7f-ada5-017db9da4f81",
+				"whenCondition": "WhenTrue",
+				"inRepeatBlock": true,
 				"position": {
-					"x": 2430.8354485195,
-					"y": 807.9291153335856
+					"x": 1644,
+					"y": 494
 				},
-				"skake": false
+				"agamaData": {
+					"id": "Agama-trigger-Node-8b98ffa4-8732-46cf-8bda-6f922379414c",
+					"parentId": "Agama-when-Node-2493baf6-a7d6-4f7f-ada5-017db9da4f81",
+					"type": "Agama-trigger-Node",
+					"displayName": "",
+					"hasComment": true,
+					"comment": "Trigger sub-routine to verify email",
+					"whenCondition": "WhenTrue",
+					"inRepeatBlock": true,
+					"nodeIcon": "fluent-mdl2:trigger-approval",
+					"flowFileName": "org.gluu.agama.smtp.emailVerification",
+					"arguments": "email false userData.context",
+					"asssignedVariableName": "emailVerificationResult",
+					"exceptionVariableField": ""
+				}
 			},
 			"selected": false,
+			"dragging": false,
 			"positionAbsolute": {
-				"x": 2430.8354485195,
-				"y": 807.9291153335856
-			},
-			"dragging": false
+				"x": 1644,
+				"y": 494
+			}
 		},
 		{
-			"width": 270,
-			"height": 55,
-			"id": "Agama-note-9000bb4c-512e-4530-ad7e-ea1aa13ddd66",
+			"width": 210,
+			"height": 140,
+			"id": "Agama-when-Node-2493baf6-a7d6-4f7f-ada5-017db9da4f81",
 			"position": {
-				"x": 2078.1850535354097,
-				"y": 508.11884467935954
+				"x": 1531,
+				"y": 264
 			},
-			"type": "notes",
+			"parentId": "Agama-assignment-Node-459e8300-529f-4716-819f-e1aae035f3ca",
+			"type": "when",
 			"data": {
-				"id": "Agama-note-9000bb4c-512e-4530-ad7e-ea1aa13ddd66",
-				"type": "Agama-note",
-				"notes": "Email OTP verification is successful. Call sub-routine to register new user. ",
+				"id": "Agama-when-Node-2493baf6-a7d6-4f7f-ada5-017db9da4f81",
+				"type": "Agama-when-Node",
+				"parentId": "Agama-assignment-Node-459e8300-529f-4716-819f-e1aae035f3ca",
+				"whenCondition": "",
+				"inRepeatBlock": true,
 				"position": {
-					"x": 2078.1850535354097,
-					"y": 508.11884467935954
+					"x": 1531,
+					"y": 264
 				},
-				"skake": false
+				"agamaData": {
+					"id": "Agama-when-Node-2493baf6-a7d6-4f7f-ada5-017db9da4f81",
+					"parentId": "Agama-assignment-Node-459e8300-529f-4716-819f-e1aae035f3ca",
+					"type": "Agama-when-Node",
+					"conditions": [
+						{
+							"variable": "emailUnknown",
+							"operator": "is",
+							"dataValue": "true",
+							"combinator": "none"
+						}
+					],
+					"hasComment": true,
+					"inRepeatBlock": true,
+					"hasSuccess": true
+				},
+				"handles": [
+					"Agama-when-Node-2493baf6-a7d6-4f7f-ada5-017db9da4f81.FAILURE",
+					"Agama-when-Node-2493baf6-a7d6-4f7f-ada5-017db9da4f81.SUCCESS"
+				]
 			},
-			"selected": false,
 			"positionAbsolute": {
-				"x": 2078.1850535354097,
-				"y": 508.11884467935954
+				"x": 1531,
+				"y": 264
 			},
+			"selected": false,
 			"dragging": false
 		},
 		{
-			"width": 270,
-			"height": 55,
-			"id": "Agama-note-4888adb9-94c1-4e6e-9e6e-e8c82902c87a",
+			"width": 170,
+			"height": 124,
+			"id": "Agama-assignment-Node-459e8300-529f-4716-819f-e1aae035f3ca",
 			"position": {
-				"x": 2239.0028232349955,
-				"y": 325.47580623483094
+				"x": 1331,
+				"y": 264
 			},
-			"type": "notes",
+			"type": "assignment",
 			"data": {
-				"id": "Agama-note-4888adb9-94c1-4e6e-9e6e-e8c82902c87a",
-				"type": "Agama-note",
-				"notes": "Email OTP verification failed. Authentication is unsuccessful. Finish the flow.",
+				"id": "Agama-assignment-Node-459e8300-529f-4716-819f-e1aae035f3ca",
+				"type": "Agama-assignment-Node",
+				"parentId": "Agama-call-Node-e1c99e34-9e8a-409a-bcf1-cb709302560d",
+				"whenCondition": "",
+				"inRepeatBlock": true,
 				"position": {
-					"x": 2239.0028232349955,
-					"y": 325.47580623483094
+					"x": 1331,
+					"y": 264
 				},
-				"skake": false
+				"agamaData": {
+					"id": "Agama-assignment-Node-459e8300-529f-4716-819f-e1aae035f3ca",
+					"parentId": "Agama-call-Node-e1c99e34-9e8a-409a-bcf1-cb709302560d",
+					"type": "Agama-assignment-Node",
+					"displayName": "",
+					"hasComment": true,
+					"comment": "1. Logic to determine if user email is already registered 2. Initialize location, timezone info from UI to user-data",
+					"whenCondition": "",
+					"inRepeatBlock": true,
+					"assignments": [
+						{
+							"variableTypeCheck": false,
+							"assignmentExpression": "userData.empty",
+							"assignedVariableName": "emailUnknown"
+						},
+						{
+							"variableTypeCheck": false,
+							"assignmentExpression": "{ location: uiInput.location, timeZone: uiInput.zone, device: uiInput.device }",
+							"assignedVariableName": "userData.context"
+						}
+					],
+					"nodeIcon": "material-symbols:equal"
+				}
 			},
 			"selected": false,
+			"dragging": false,
 			"positionAbsolute": {
-				"x": 2239.0028232349955,
-				"y": 325.47580623483094
-			},
-			"dragging": false
+				"x": 1331,
+				"y": 264
+			}
 		},
 		{
-			"width": 270,
-			"height": 94,
-			"id": "Agama-note-24df480b-c97a-4611-b4ce-d54d068c13d3",
+			"width": 170,
+			"height": 124,
+			"id": "Agama-call-Node-e1c99e34-9e8a-409a-bcf1-cb709302560d",
 			"position": {
-				"x": 1443,
-				"y": 447
+				"x": 1131,
+				"y": 264
 			},
-			"type": "notes",
+			"type": "call",
 			"data": {
-				"id": "Agama-note-24df480b-c97a-4611-b4ce-d54d068c13d3",
-				"type": "Agama-note",
-				"notes": "Call sub-routine which sends OTP to the email address and allows user to enter the same OTP on UI. If OTP matches the email verification is successful.",
+				"id": "Agama-call-Node-e1c99e34-9e8a-409a-bcf1-cb709302560d",
+				"type": "Agama-call-Node",
+				"parentId": "Agama-call-Node-58689efb-2c01-4374-b573-e1567b04b04a",
+				"whenCondition": "",
+				"inRepeatBlock": true,
 				"position": {
-					"x": 1443,
-					"y": 447
+					"x": 1131,
+					"y": 264
 				},
-				"skake": false
+				"agamaData": {
+					"id": "Agama-call-Node-e1c99e34-9e8a-409a-bcf1-cb709302560d",
+					"parentId": "Agama-call-Node-58689efb-2c01-4374-b573-e1567b04b04a",
+					"type": "Agama-call-Node",
+					"displayName": "",
+					"hasComment": true,
+					"comment": "Get User Details using Email Service",
+					"javaClassName": "emailService",
+					"javaMethodName": "getUserEntity",
+					"javaVariableName": "emailService",
+					"exceptionVariableField": "",
+					"callType": "Call method on instance",
+					"whenCondition": "",
+					"inRepeatBlock": true,
+					"arguments": "email",
+					"nodeIcon": "material-symbols:code",
+					"asssignedVariableName": "userData"
+				}
 			},
 			"selected": false,
+			"dragging": false,
 			"positionAbsolute": {
-				"x": 1443,
-				"y": 447
-			},
-			"dragging": false
+				"x": 1131,
+				"y": 264
+			}
 		},
 		{
-			"width": 270,
-			"height": 55,
-			"id": "Agama-note-4460ad57-8273-4683-8b86-a51a9ffbba35",
+			"width": 170,
+			"height": 124,
+			"id": "Agama-call-Node-58689efb-2c01-4374-b573-e1567b04b04a",
 			"position": {
-				"x": 2391,
-				"y": -291
+				"x": 931,
+				"y": 264
 			},
-			"type": "notes",
+			"type": "call",
 			"data": {
-				"id": "Agama-note-4460ad57-8273-4683-8b86-a51a9ffbba35",
-				"type": "Agama-note",
-				"notes": "Email OTP verification failed. Authentication is unsuccessful. Finish the flow.",
+				"id": "Agama-call-Node-58689efb-2c01-4374-b573-e1567b04b04a",
+				"type": "Agama-call-Node",
+				"parentId": "Agama-assignment-Node-d07b1e21-f2fe-47f7-bcfd-e6b782ab4b0f",
+				"whenCondition": "",
+				"inRepeatBlock": true,
 				"position": {
-					"x": 2391,
-					"y": -291
+					"x": 931,
+					"y": 264
 				},
-				"skake": false
+				"agamaData": {
+					"id": "Agama-call-Node-58689efb-2c01-4374-b573-e1567b04b04a",
+					"parentId": "Agama-assignment-Node-d07b1e21-f2fe-47f7-bcfd-e6b782ab4b0f",
+					"type": "Agama-call-Node",
+					"displayName": "",
+					"hasComment": true,
+					"comment": "Create an instance Email Service",
+					"javaClassName": "org.gluu.agama.smtp.EmailService",
+					"javaMethodName": "getInstance",
+					"javaVariableName": "",
+					"exceptionVariableField": "",
+					"callType": "Call static method",
+					"whenCondition": "",
+					"inRepeatBlock": true,
+					"arguments": "",
+					"nodeIcon": "material-symbols:code",
+					"asssignedVariableName": "emailService"
+				}
 			},
 			"selected": false,
+			"dragging": false,
 			"positionAbsolute": {
-				"x": 2391,
-				"y": -291
-			},
-			"dragging": false
+				"x": 931,
+				"y": 264
+			}
 		},
 		{
-			"width": 270,
-			"height": 55,
-			"id": "Agama-note-59c69197-43ef-487e-be24-25c0a288f415",
+			"width": 170,
+			"height": 124,
+			"id": "Agama-assignment-Node-d07b1e21-f2fe-47f7-bcfd-e6b782ab4b0f",
 			"position": {
-				"x": 2255,
-				"y": 54
+				"x": 731,
+				"y": 264
 			},
-			"type": "notes",
+			"type": "assignment",
 			"data": {
-				"id": "Agama-note-59c69197-43ef-487e-be24-25c0a288f415",
-				"type": "Agama-note",
-				"notes": "Email OTP verification successful. Authentication is successful. Finish the flow.",
+				"id": "Agama-assignment-Node-d07b1e21-f2fe-47f7-bcfd-e6b782ab4b0f",
+				"type": "Agama-assignment-Node",
+				"parentId": "Agama-rrf-Node-34ad90cb-5100-4b88-bb7e-116120f609ce",
+				"whenCondition": "",
+				"inRepeatBlock": true,
 				"position": {
-					"x": 2255,
-					"y": 54
+					"x": 731,
+					"y": 264
 				},
-				"skake": false
+				"agamaData": {
+					"id": "Agama-assignment-Node-d07b1e21-f2fe-47f7-bcfd-e6b782ab4b0f",
+					"parentId": "Agama-rrf-Node-34ad90cb-5100-4b88-bb7e-116120f609ce",
+					"type": "Agama-assignment-Node",
+					"displayName": "",
+					"hasComment": true,
+					"comment": "Assign user email input to a variable",
+					"whenCondition": "",
+					"inRepeatBlock": true,
+					"assignments": [
+						{
+							"variableTypeCheck": false,
+							"assignmentExpression": "uiInput.email",
+							"assignedVariableName": "email"
+						}
+					],
+					"nodeIcon": "material-symbols:equal"
+				}
 			},
 			"selected": false,
+			"dragging": false,
 			"positionAbsolute": {
-				"x": 2255,
-				"y": 54
-			},
-			"dragging": false
+				"x": 731,
+				"y": 264
+			}
 		},
 		{
-			"width": 270,
-			"height": 94,
-			"id": "Agama-note-05287edd-b2fb-44ab-9a44-84a2b24299a8",
+			"width": 170,
+			"height": 124,
+			"id": "Agama-rrf-Node-34ad90cb-5100-4b88-bb7e-116120f609ce",
 			"position": {
-				"x": 1815,
-				"y": -322
+				"x": 531,
+				"y": 264
 			},
-			"type": "notes",
+			"type": "rrf",
 			"data": {
-				"id": "Agama-note-05287edd-b2fb-44ab-9a44-84a2b24299a8",
-				"type": "Agama-note",
-				"notes": "Call sub-routine which sends OTP to the email address and allows user to enter the same OTP on UI. If OTP matches the email verification is successful.",
+				"id": "Agama-rrf-Node-34ad90cb-5100-4b88-bb7e-116120f609ce",
+				"type": "Agama-rrf-Node",
+				"parentId": "Agama-repeat-Node-34862b8f-6f01-41d7-b101-138a1142008c",
+				"whenCondition": "",
+				"inRepeatBlock": true,
 				"position": {
-					"x": 1815,
-					"y": -322
+					"x": 531,
+					"y": 264
 				},
-				"skake": false
+				"agamaData": {
+					"id": "Agama-rrf-Node-34ad90cb-5100-4b88-bb7e-116120f609ce",
+					"parentId": "Agama-repeat-Node-34862b8f-6f01-41d7-b101-138a1142008c",
+					"type": "Agama-rrf-Node",
+					"displayName": "",
+					"hasComment": true,
+					"comment": "Retrieve user email address from UI",
+					"whenCondition": "",
+					"inRepeatBlock": true,
+					"assignments": [],
+					"nodeIcon": "ph:globe-simple",
+					"templatePath": "main.ftlh",
+					"asssignedVariableName": "uiInput",
+					"arguments": "emailObj"
+				}
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 1815,
-				"y": -322
+				"x": 531,
+				"y": 264
 			},
 			"dragging": false
 		},
+		{
+			"width": 170,
+			"height": 124,
+			"id": "Agama-repeat-Node-34862b8f-6f01-41d7-b101-138a1142008c",
+			"position": {
+				"x": 430,
+				"y": 30
+			},
+			"type": "repeat",
+			"data": {
+				"id": "Agama-repeat-Node-34862b8f-6f01-41d7-b101-138a1142008c",
+				"type": "Agama-repeat-Node",
+				"parentId": "Agama-assignment-Node-2cc7c857-fc27-4680-ad39-c205bf88f997",
+				"whenCondition": "",
+				"inRepeatBlock": false,
+				"handles": [
+					"Agama-repeat-Node-34862b8f-6f01-41d7-b101-138a1142008c.InFlow",
+					"Agama-repeat-Node-34862b8f-6f01-41d7-b101-138a1142008c.InRepeatBlock"
+				],
+				"position": {
+					"x": 430,
+					"y": 30
+				},
+				"agamaData": {
+					"id": "Agama-repeat-Node-34862b8f-6f01-41d7-b101-138a1142008c",
+					"parentId": "Agama-assignment-Node-2cc7c857-fc27-4680-ad39-c205bf88f997",
+					"type": "Agama-repeat-Node",
+					"nodeIcon": "material-symbols:event-repeat-outline-rounded",
+					"maxIteration": "3",
+					"maxIterationVariableName": "max",
+					"comment": "Iterate x times max",
+					"hasComment": true
+				}
+			},
+			"selected": false,
+			"dragging": false,
+			"positionAbsolute": {
+				"x": 430,
+				"y": 30
+			}
+		},
 		{
 			"width": 270,
-			"height": 55,
-			"id": "Agama-note-f2206bdf-edfa-4370-9e17-f8a78d1e0bfe",
+			"height": 81,
+			"id": "Agama-note-ecf2fe6f-765d-4d6a-b6a2-3e91b59630fc",
 			"position": {
-				"x": 1513,
-				"y": -29
+				"x": 3054.57865528289,
+				"y": 823.0108923035444
 			},
 			"type": "notes",
 			"data": {
-				"id": "Agama-note-f2206bdf-edfa-4370-9e17-f8a78d1e0bfe",
+				"id": "Agama-note-ecf2fe6f-765d-4d6a-b6a2-3e91b59630fc",
 				"type": "Agama-note",
-				"notes": "User with entered email address is not registered on authentication server. ",
+				"notes": "Show UI with successful user registration message. If the user clicks on continue button then finish the registration flow successfully.",
 				"position": {
-					"x": 1513,
-					"y": -29
+					"x": 3054.57865528289,
+					"y": 823.0108923035444
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 1513,
-				"y": -29
+				"x": 3054.57865528289,
+				"y": 823.0108923035444
 			},
 			"dragging": false
 		},
 		{
 			"width": 270,
-			"height": 55,
-			"id": "Agama-note-1b6bff57-8181-415a-a512-57cfa54b9c43",
+			"height": 42,
+			"id": "Agama-note-f4af61a8-27c5-4569-b47c-ba193d77fc2c",
 			"position": {
-				"x": 1254,
-				"y": 229
+				"x": 2430.8354485195,
+				"y": 807.9291153335856
 			},
 			"type": "notes",
 			"data": {
-				"id": "Agama-note-1b6bff57-8181-415a-a512-57cfa54b9c43",
+				"id": "Agama-note-f4af61a8-27c5-4569-b47c-ba193d77fc2c",
 				"type": "Agama-note",
-				"notes": "User with entered email address already registered on authentication server. ",
+				"notes": "New User registration is successful.",
 				"position": {
-					"x": 1254,
-					"y": 229
+					"x": 2430.8354485195,
+					"y": 807.9291153335856
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 1254,
-				"y": 229
+				"x": 2430.8354485195,
+				"y": 807.9291153335856
 			},
 			"dragging": false
 		},
 		{
 			"width": 270,
-			"height": 68,
-			"id": "Agama-note-450f1b80-9e04-4e03-b4b2-672fc395aaba",
+			"height": 55,
+			"id": "Agama-note-9000bb4c-512e-4530-ad7e-ea1aa13ddd66",
 			"position": {
-				"x": 975,
-				"y": -103
+				"x": 2078.1850535354097,
+				"y": 508.11884467935954
 			},
 			"type": "notes",
 			"data": {
-				"id": "Agama-note-450f1b80-9e04-4e03-b4b2-672fc395aaba",
+				"id": "Agama-note-9000bb4c-512e-4530-ad7e-ea1aa13ddd66",
 				"type": "Agama-note",
-				"notes": "Email service will will try to fetch user details from authentication server using the entered email address.",
+				"notes": "Email OTP verification is successful. Call sub-routine to register new user. ",
 				"position": {
-					"x": 975,
-					"y": -103
+					"x": 2078.1850535354097,
+					"y": 508.11884467935954
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 975,
-				"y": -103
+				"x": 2078.1850535354097,
+				"y": 508.11884467935954
 			},
 			"dragging": false
 		},
 		{
 			"width": 270,
-			"height": 42,
-			"id": "Agama-note-9b67b98d-875a-49d7-ad75-a3349c7252ab",
+			"height": 55,
+			"id": "Agama-note-4888adb9-94c1-4e6e-9e6e-e8c82902c87a",
 			"position": {
-				"x": 398,
-				"y": -100
+				"x": 2239.0028232349955,
+				"y": 325.47580623483094
 			},
 			"type": "notes",
 			"data": {
-				"id": "Agama-note-9b67b98d-875a-49d7-ad75-a3349c7252ab",
+				"id": "Agama-note-4888adb9-94c1-4e6e-9e6e-e8c82902c87a",
 				"type": "Agama-note",
-				"notes": "Retrieving email address entered by user on UI. ",
+				"notes": "Email OTP verification failed. Authentication is unsuccessful. Finish the flow.",
 				"position": {
-					"x": 398,
-					"y": -100
+					"x": 2239.0028232349955,
+					"y": 325.47580623483094
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 398,
-				"y": -100
+				"x": 2239.0028232349955,
+				"y": 325.47580623483094
 			},
 			"dragging": false
 		},
 		{
 			"width": 270,
-			"height": 42,
-			"id": "Agama-note-a700c8a0-5dc0-47e3-99d4-8c4ff2f73ebd",
+			"height": 81,
+			"id": "Agama-note-24df480b-c97a-4611-b4ce-d54d068c13d3",
 			"position": {
-				"x": -7,
-				"y": -101
+				"x": 1302,
+				"y": 517
 			},
 			"type": "notes",
 			"data": {
-				"id": "Agama-note-a700c8a0-5dc0-47e3-99d4-8c4ff2f73ebd",
+				"id": "Agama-note-24df480b-c97a-4611-b4ce-d54d068c13d3",
 				"type": "Agama-note",
-				"notes": "The email authentication flow starts from here.",
+				"notes": "Call sub-routine which sends OTP to the email address and allows user to enter the same OTP on UI. If OTP matches the email verification is successful.",
 				"position": {
-					"x": -7,
-					"y": -101
+					"x": 1302,
+					"y": 517
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": -7,
-				"y": -101
+				"x": 1302,
+				"y": 517
 			},
 			"dragging": false
 		},
 		{
-			"width": 170,
-			"height": 124,
-			"id": "finish-6afb4cd4-1b93-41d9-8777-c4716d568bed",
+			"width": 270,
+			"height": 55,
+			"id": "Agama-note-4460ad57-8273-4683-8b86-a51a9ffbba35",
 			"position": {
-				"x": 2633.6280344645425,
-				"y": 312.2588988734077
+				"x": 2391,
+				"y": -291
 			},
-			"type": "finish",
+			"type": "notes",
 			"data": {
-				"id": "finish-6afb4cd4-1b93-41d9-8777-c4716d568bed",
-				"type": "Agama-finish-Flow",
-				"parentId": "Agama-log-Node-09fa4386-5159-468b-8eea-51c288174396",
-				"whenCondition": "",
-				"inRepeatBlock": false,
-				"handles": [],
+				"id": "Agama-note-4460ad57-8273-4683-8b86-a51a9ffbba35",
+				"type": "Agama-note",
+				"notes": "Email OTP verification failed. Authentication is unsuccessful. Finish the flow.",
 				"position": {
-					"x": 2633.6280344645425,
-					"y": 312.2588988734077
-				},
-				"agamaData": {
-					"id": "finish-6afb4cd4-1b93-41d9-8777-c4716d568bed",
-					"parentId": "Agama-log-Node-09fa4386-5159-468b-8eea-51c288174396",
-					"type": "Agama-finish-Flow",
-					"hasSuccess": false,
-					"hasFailure": false,
-					"hasComment": true,
-					"comment": "Email verification is unsuccessful",
-					"flowfilename": "",
-					"returnVariable": "emailVerificationResult",
-					"finishMode": "withVariable",
-					"nodeIcon": "material-symbols:line-end-square-rounded"
+					"x": 2391,
+					"y": -291
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 2633.6280344645425,
-				"y": 312.2588988734077
+				"x": 2391,
+				"y": -291
 			},
 			"dragging": false
 		},
 		{
-			"width": 170,
-			"height": 124,
-			"id": "finish-abbe7fa4-7c2b-456c-8c76-9181bf973f8e",
+			"width": 270,
+			"height": 55,
+			"id": "Agama-note-59c69197-43ef-487e-be24-25c0a288f415",
 			"position": {
-				"x": 2586,
-				"y": -178
+				"x": 2255,
+				"y": 54
 			},
-			"type": "finish",
+			"type": "notes",
 			"data": {
-				"id": "finish-abbe7fa4-7c2b-456c-8c76-9181bf973f8e",
-				"type": "Agama-finish-Flow",
-				"parentId": "Agama-log-Node-1475f784-2410-468a-9644-37023510b2f3",
-				"whenCondition": "",
-				"inRepeatBlock": false,
-				"handles": [],
+				"id": "Agama-note-59c69197-43ef-487e-be24-25c0a288f415",
+				"type": "Agama-note",
+				"notes": "Email OTP verification successful. Authentication is successful. Finish the flow.",
 				"position": {
-					"x": 2586,
-					"y": -178
-				},
-				"agamaData": {
-					"id": "finish-abbe7fa4-7c2b-456c-8c76-9181bf973f8e",
-					"parentId": "Agama-log-Node-1475f784-2410-468a-9644-37023510b2f3",
-					"type": "Agama-finish-Flow",
-					"hasSuccess": false,
-					"hasFailure": false,
-					"hasComment": true,
-					"comment": "Credential enrollment or authenticator flow failed",
-					"flowfilename": "",
-					"returnVariable": "Credential enrollment or authenticator flow failed",
-					"finishMode": "withFailure",
-					"nodeIcon": "material-symbols:line-end-square-rounded"
+					"x": 2255,
+					"y": 54
 				},
 				"skake": false
 			},
 			"selected": false,
-			"dragging": false,
 			"positionAbsolute": {
-				"x": 2586,
-				"y": -178
-			}
+				"x": 2255,
+				"y": 54
+			},
+			"dragging": false
 		},
 		{
-			"width": 170,
-			"height": 124,
-			"id": "Agama-log-Node-1475f784-2410-468a-9644-37023510b2f3",
+			"width": 270,
+			"height": 81,
+			"id": "Agama-note-05287edd-b2fb-44ab-9a44-84a2b24299a8",
 			"position": {
-				"x": 2352,
-				"y": -178
+				"x": 1815,
+				"y": -322
 			},
-			"type": "log",
+			"type": "notes",
 			"data": {
-				"id": "Agama-log-Node-1475f784-2410-468a-9644-37023510b2f3",
-				"type": "Agama-log-Node",
-				"parentId": "Agama-when-Node-ce35c4ba-e067-4247-9a3d-ba685765cb1a",
-				"whenCondition": "WhenFalse",
-				"inRepeatBlock": false,
+				"id": "Agama-note-05287edd-b2fb-44ab-9a44-84a2b24299a8",
+				"type": "Agama-note",
+				"notes": "Call sub-routine which sends OTP to the email address and allows user to enter the same OTP on UI. If OTP matches the email verification is successful.",
 				"position": {
-					"x": 2352,
-					"y": -178
-				},
-				"agamaData": {
-					"id": "Agama-log-Node-1475f784-2410-468a-9644-37023510b2f3",
-					"parentId": "Agama-when-Node-ce35c4ba-e067-4247-9a3d-ba685765cb1a",
-					"type": "Agama-log-Node",
-					"displayName": "",
-					"hasComment": true,
-					"comment": "Fail if credential enrollment or authenticator flow failed",
-					"whenCondition": "WhenFalse",
-					"inRepeatBlock": false,
-					"logMessage": "\"Fail if credential enrollment or authenticator flow failed\"",
-					"logLevel": "info",
-					"nodeIcon": "octicon:log-16"
+					"x": 1815,
+					"y": -322
 				},
 				"skake": false
 			},
 			"selected": false,
-			"dragging": false,
 			"positionAbsolute": {
-				"x": 2352,
-				"y": -178
-			}
+				"x": 1815,
+				"y": -322
+			},
+			"dragging": false
 		},
 		{
-			"width": 170,
-			"height": 124,
-			"id": "finish-ef86cfc4-09e6-4f66-86bf-25acdaedd700",
+			"width": 270,
+			"height": 55,
+			"id": "Agama-note-f2206bdf-edfa-4370-9e17-f8a78d1e0bfe",
 			"position": {
-				"x": 2406,
-				"y": 147
+				"x": 1513,
+				"y": -29
 			},
-			"type": "finish",
+			"type": "notes",
 			"data": {
-				"id": "finish-ef86cfc4-09e6-4f66-86bf-25acdaedd700",
-				"type": "Agama-finish-Flow",
-				"parentId": "Agama-assignment-Node-d5f2b9df-18d7-4f38-ab7d-cbb16bd05723",
-				"whenCondition": "",
-				"inRepeatBlock": false,
-				"handles": [],
+				"id": "Agama-note-f2206bdf-edfa-4370-9e17-f8a78d1e0bfe",
+				"type": "Agama-note",
+				"notes": "User with entered email address is not registered on authentication server. ",
 				"position": {
-					"x": 2406,
-					"y": 147
-				},
-				"agamaData": {
-					"id": "finish-ef86cfc4-09e6-4f66-86bf-25acdaedd700",
-					"parentId": "Agama-assignment-Node-d5f2b9df-18d7-4f38-ab7d-cbb16bd05723",
-					"type": "Agama-finish-Flow",
-					"hasSuccess": false,
-					"hasFailure": false,
-					"hasComment": true,
-					"comment": "Email verification and hence authentication is successful",
-					"flowfilename": "",
-					"returnVariable": "{ userId: uid, uid: uid}",
-					"finishMode": "withSuccess",
-					"nodeIcon": "material-symbols:line-end-square-rounded"
+					"x": 1513,
+					"y": -29
 				},
 				"skake": false
 			},
 			"selected": false,
-			"dragging": false,
 			"positionAbsolute": {
-				"x": 2406,
-				"y": 147
-			}
+				"x": 1513,
+				"y": -29
+			},
+			"dragging": false
 		},
 		{
-			"width": 170,
-			"height": 124,
-			"id": "Agama-assignment-Node-d5f2b9df-18d7-4f38-ab7d-cbb16bd05723",
+			"width": 270,
+			"height": 55,
+			"id": "Agama-note-1b6bff57-8181-415a-a512-57cfa54b9c43",
 			"position": {
-				"x": 2191,
-				"y": 147
+				"x": 1339,
+				"y": 118.00000000000003
 			},
-			"type": "assignment",
+			"type": "notes",
 			"data": {
-				"id": "Agama-assignment-Node-d5f2b9df-18d7-4f38-ab7d-cbb16bd05723",
-				"type": "Agama-assignment-Node",
-				"parentId": "Agama-when-Node-ce35c4ba-e067-4247-9a3d-ba685765cb1a",
-				"whenCondition": "WhenTrue",
-				"inRepeatBlock": false,
+				"id": "Agama-note-1b6bff57-8181-415a-a512-57cfa54b9c43",
+				"type": "Agama-note",
+				"notes": "User with entered email address already registered on authentication server. ",
 				"position": {
-					"x": 2191,
-					"y": 147
-				},
-				"agamaData": {
-					"id": "Agama-assignment-Node-d5f2b9df-18d7-4f38-ab7d-cbb16bd05723",
-					"parentId": "Agama-when-Node-ce35c4ba-e067-4247-9a3d-ba685765cb1a",
-					"type": "Agama-assignment-Node",
-					"displayName": "",
-					"hasComment": true,
-					"comment": "Assigning user id (email) to a variable",
-					"whenCondition": "WhenTrue",
-					"inRepeatBlock": false,
-					"assignments": [
-						{
-							"variableTypeCheck": false,
-							"assignmentExpression": "userData.uid",
-							"assignedVariableName": "uid"
-						}
-					],
-					"nodeIcon": "material-symbols:equal"
+					"x": 1339,
+					"y": 118.00000000000003
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 2191,
-				"y": 147
+				"x": 1339,
+				"y": 118.00000000000003
 			},
 			"dragging": false
 		},
 		{
-			"width": 210,
-			"height": 140,
-			"id": "Agama-when-Node-ce35c4ba-e067-4247-9a3d-ba685765cb1a",
+			"width": 270,
+			"height": 68,
+			"id": "Agama-note-450f1b80-9e04-4e03-b4b2-672fc395aaba",
 			"position": {
-				"x": 2079,
-				"y": -122
+				"x": 1019,
+				"y": 111.99999999999991
 			},
-			"parentId": "Agama-trigger-Node-3a16a396-2d98-4eba-8fc0-eb59af02c7d1",
-			"type": "when",
+			"type": "notes",
 			"data": {
-				"id": "Agama-when-Node-ce35c4ba-e067-4247-9a3d-ba685765cb1a",
-				"type": "Agama-when-Node",
-				"parentId": "Agama-trigger-Node-3a16a396-2d98-4eba-8fc0-eb59af02c7d1",
-				"whenCondition": "",
-				"inRepeatBlock": false,
+				"id": "Agama-note-450f1b80-9e04-4e03-b4b2-672fc395aaba",
+				"type": "Agama-note",
+				"notes": "Email service will will try to fetch user details from authentication server using the entered email address.",
 				"position": {
-					"x": 2079,
-					"y": -122
+					"x": 1019,
+					"y": 111.99999999999991
 				},
-				"agamaData": {
-					"id": "Agama-when-Node-ce35c4ba-e067-4247-9a3d-ba685765cb1a",
-					"parentId": "Agama-trigger-Node-3a16a396-2d98-4eba-8fc0-eb59af02c7d1",
-					"type": "Agama-when-Node",
-					"variableField": "emailVerificationResult.success",
-					"conditionInputField": "is",
-					"valueField": "true",
-					"comment": "When email verification is successful",
-					"hasComment": true,
-					"inRepeatBlock": false,
-					"hasSuccess": "",
-					"hasFailure": true,
-					"hasNoRepeat": false,
-					"hasRepeat": false
-				},
-				"handles": [
-					"Agama-when-Node-ce35c4ba-e067-4247-9a3d-ba685765cb1a.FAILURE",
-					"Agama-when-Node-ce35c4ba-e067-4247-9a3d-ba685765cb1a.SUCCESS"
-				],
 				"skake": false
 			},
 			"selected": false,
-			"dragging": false,
 			"positionAbsolute": {
-				"x": 2079,
-				"y": -122
-			}
-		},
-		{
-			"width": 170,
-			"height": 124,
-			"id": "Agama-trigger-Node-3a16a396-2d98-4eba-8fc0-eb59af02c7d1",
-			"position": {
-				"x": 1881,
-				"y": -177
-			},
-			"type": "trigger",
-			"data": {
-				"id": "Agama-trigger-Node-3a16a396-2d98-4eba-8fc0-eb59af02c7d1",
-				"type": "Agama-trigger-Node",
-				"parentId": "Agama-log-Node-0bca696a-a0a6-4c3a-9664-8d7bf9100a44",
-				"whenCondition": "",
-				"inRepeatBlock": false,
-				"position": {
-					"x": 1881,
-					"y": -177
-				},
-				"agamaData": {
-					"id": "Agama-trigger-Node-3a16a396-2d98-4eba-8fc0-eb59af02c7d1",
-					"parentId": "Agama-log-Node-0bca696a-a0a6-4c3a-9664-8d7bf9100a44",
-					"type": "Agama-trigger-Node",
-					"displayName": "",
-					"hasComment": true,
-					"comment": "Run email verification sub-routine",
-					"whenCondition": "",
-					"inRepeatBlock": false,
-					"nodeIcon": "fluent-mdl2:trigger-approval",
-					"flowFileName": "org.gluu.agama.smtp.emailVerification",
-					"arguments": [
-						"email",
-						"true",
-						"userData.context"
-					],
-					"asssignedVariableName": "emailVerificationResult",
-					"exceptionVariableField": ""
-				},
-				"skake": false
-			},
-			"selected": false,
-			"dragging": false,
-			"positionAbsolute": {
-				"x": 1881,
-				"y": -177
-			}
-		},
-		{
-			"width": 170,
-			"height": 124,
-			"id": "Agama-log-Node-0bca696a-a0a6-4c3a-9664-8d7bf9100a44",
-			"position": {
-				"x": 1647,
-				"y": -178
-			},
-			"type": "log",
-			"data": {
-				"id": "Agama-log-Node-0bca696a-a0a6-4c3a-9664-8d7bf9100a44",
-				"type": "Agama-log-Node",
-				"parentId": "Agama-when-Node-463bd034-349f-4878-8ff1-8de69079fc66",
-				"whenCondition": "WhenFalse",
-				"inRepeatBlock": false,
-				"position": {
-					"x": 1647,
-					"y": -178
-				},
-				"agamaData": {
-					"id": "Agama-log-Node-0bca696a-a0a6-4c3a-9664-8d7bf9100a44",
-					"parentId": "Agama-when-Node-463bd034-349f-4878-8ff1-8de69079fc66",
-					"type": "Agama-log-Node",
-					"displayName": "",
-					"hasComment": true,
-					"comment": "User with same email already exists",
-					"whenCondition": "WhenFalse",
-					"inRepeatBlock": false,
-					"logMessage": "\"User with e-mail % is known\" email",
-					"logLevel": "info",
-					"nodeIcon": "octicon:log-16"
-				},
-				"skake": false
-			},
-			"selected": false,
-			"dragging": false,
-			"positionAbsolute": {
-				"x": 1647,
-				"y": -178
-			}
-		},
-		{
-			"width": 170,
-			"height": 124,
-			"id": "Agama-log-Node-09fa4386-5159-468b-8eea-51c288174396",
-			"position": {
-				"x": 1994,
-				"y": 314
-			},
-			"type": "log",
-			"data": {
-				"id": "Agama-log-Node-09fa4386-5159-468b-8eea-51c288174396",
-				"type": "Agama-log-Node",
-				"parentId": "Agama-when-Node-668c75bc-6de9-47a2-9a50-173709df9f96",
-				"whenCondition": "WhenFalse",
-				"inRepeatBlock": false,
-				"position": {
-					"x": 1994,
-					"y": 314
-				},
-				"agamaData": {
-					"id": "Agama-log-Node-09fa4386-5159-468b-8eea-51c288174396",
-					"parentId": "Agama-when-Node-668c75bc-6de9-47a2-9a50-173709df9f96",
-					"type": "Agama-log-Node",
-					"displayName": "",
-					"hasComment": true,
-					"comment": "The email verification is not successful",
-					"whenCondition": "WhenFalse",
-					"inRepeatBlock": false,
-					"logMessage": "\"Email verification is not successful\"",
-					"logLevel": "info",
-					"nodeIcon": "octicon:log-16"
-				},
-				"skake": false
-			},
-			"selected": false,
-			"dragging": false,
-			"positionAbsolute": {
-				"x": 1994,
-				"y": 314
-			}
-		},
-		{
-			"width": 170,
-			"height": 124,
-			"id": "finish-f9d128eb-74ac-4d3c-a53d-4b4d604a225f",
-			"position": {
-				"x": 3284,
-				"y": 1166
-			},
-			"type": "finish",
-			"data": {
-				"id": "finish-f9d128eb-74ac-4d3c-a53d-4b4d604a225f",
-				"type": "Agama-finish-Flow",
-				"parentId": "Agama-assignment-Node-20c7553f-b251-4636-83cb-443f7c4242b8",
-				"whenCondition": "",
-				"inRepeatBlock": false,
-				"handles": [],
-				"position": {
-					"x": 3284,
-					"y": 1166
-				},
-				"agamaData": {
-					"id": "finish-f9d128eb-74ac-4d3c-a53d-4b4d604a225f",
-					"parentId": "Agama-assignment-Node-20c7553f-b251-4636-83cb-443f7c4242b8",
-					"type": "Agama-finish-Flow",
-					"hasSuccess": false,
-					"hasFailure": false,
-					"hasComment": true,
-					"comment": "Finish the flow successfully",
-					"flowfilename": "",
-					"returnVariable": "{ userId: uid, uid: uid}",
-					"finishMode": "withSuccess",
-					"nodeIcon": "material-symbols:line-end-square-rounded"
-				},
-				"skake": false
-			},
-			"selected": false,
-			"dragging": false,
-			"positionAbsolute": {
-				"x": 3284,
-				"y": 1166
-			}
-		},
-		{
-			"width": 170,
-			"height": 124,
-			"id": "Agama-assignment-Node-20c7553f-b251-4636-83cb-443f7c4242b8",
-			"position": {
-				"x": 3084,
-				"y": 1166
-			},
-			"type": "assignment",
-			"data": {
-				"id": "Agama-assignment-Node-20c7553f-b251-4636-83cb-443f7c4242b8",
-				"type": "Agama-assignment-Node",
-				"parentId": "Agama-when-Node-a432eb10-da16-4d7e-8624-3c0aaace647b",
-				"whenCondition": "WhenTrue",
-				"inRepeatBlock": false,
-				"position": {
-					"x": 3084,
-					"y": 1166
-				},
-				"agamaData": {
-					"id": "Agama-assignment-Node-20c7553f-b251-4636-83cb-443f7c4242b8",
-					"parentId": "Agama-when-Node-a432eb10-da16-4d7e-8624-3c0aaace647b",
-					"type": "Agama-assignment-Node",
-					"displayName": "",
-					"hasComment": true,
-					"comment": "Assign User Id (email) to a variable",
-					"whenCondition": "WhenTrue",
-					"inRepeatBlock": false,
-					"assignments": [
-						{
-							"variableTypeCheck": false,
-							"assignmentExpression": "userData.uid",
-							"assignedVariableName": "uid"
-						}
-					],
-					"nodeIcon": "material-symbols:equal"
-				},
-				"skake": false
-			},
-			"selected": false,
-			"dragging": false,
-			"positionAbsolute": {
-				"x": 3084,
-				"y": 1166
-			}
-		},
-		{
-			"width": 210,
-			"height": 140,
-			"id": "Agama-when-Node-a432eb10-da16-4d7e-8624-3c0aaace647b",
-			"position": {
-				"x": 2971,
-				"y": 936
-			},
-			"parentId": "Agama-rrf-Node-d7e21b2c-d192-4773-bdda-08962c9bf58f",
-			"type": "when",
-			"data": {
-				"id": "Agama-when-Node-a432eb10-da16-4d7e-8624-3c0aaace647b",
-				"type": "Agama-when-Node",
-				"parentId": "Agama-rrf-Node-d7e21b2c-d192-4773-bdda-08962c9bf58f",
-				"whenCondition": "",
-				"inRepeatBlock": false,
-				"position": {
-					"x": 2971,
-					"y": 936
-				},
-				"agamaData": {
-					"id": "Agama-when-Node-a432eb10-da16-4d7e-8624-3c0aaace647b",
-					"parentId": "Agama-rrf-Node-d7e21b2c-d192-4773-bdda-08962c9bf58f",
-					"type": "Agama-when-Node",
-					"variableField": "acknowledgementInput.ack",
-					"conditionInputField": "is",
-					"valueField": "\"continue\"",
-					"comment": "User clicks in continue button",
-					"hasComment": true,
-					"inRepeatBlock": false,
-					"hasSuccess": "",
-					"hasFailure": "",
-					"hasNoRepeat": false,
-					"hasRepeat": false
-				},
-				"handles": [
-					"Agama-when-Node-a432eb10-da16-4d7e-8624-3c0aaace647b.FAILURE",
-					"Agama-when-Node-a432eb10-da16-4d7e-8624-3c0aaace647b.SUCCESS"
-				],
-				"skake": false
-			},
-			"selected": false,
-			"dragging": false,
-			"positionAbsolute": {
-				"x": 2971,
-				"y": 936
-			}
-		},
-		{
-			"width": 170,
-			"height": 124,
-			"id": "Agama-rrf-Node-d7e21b2c-d192-4773-bdda-08962c9bf58f",
-			"position": {
-				"x": 2771,
-				"y": 882
-			},
-			"type": "rrf",
-			"data": {
-				"id": "Agama-rrf-Node-d7e21b2c-d192-4773-bdda-08962c9bf58f",
-				"type": "Agama-rrf-Node",
-				"parentId": "Agama-assignment-Node-2d0b4ccb-0fe8-489c-8007-81f60bc7a24f",
-				"whenCondition": "",
-				"inRepeatBlock": false,
-				"position": {
-					"x": 2771,
-					"y": 882
-				},
-				"agamaData": {
-					"id": "Agama-rrf-Node-d7e21b2c-d192-4773-bdda-08962c9bf58f",
-					"parentId": "Agama-assignment-Node-2d0b4ccb-0fe8-489c-8007-81f60bc7a24f",
-					"type": "Agama-rrf-Node",
-					"displayName": "",
-					"hasComment": true,
-					"comment": "Show acknowledgement UI page for successful registration",
-					"whenCondition": "",
-					"inRepeatBlock": false,
-					"assignments": [],
-					"nodeIcon": "ph:globe-simple",
-					"templatePath": "acknowledgement.ftlh",
-					"asssignedVariableName": "acknowledgementInput",
-					"arguments": "userData"
-				},
-				"skake": false
+				"x": 1019,
+				"y": 111.99999999999991
 			},
-			"selected": false,
-			"dragging": false,
-			"positionAbsolute": {
-				"x": 2771,
-				"y": 882
-			}
+			"dragging": false
 		},
 		{
-			"width": 170,
-			"height": 124,
-			"id": "Agama-assignment-Node-2d0b4ccb-0fe8-489c-8007-81f60bc7a24f",
+			"width": 270,
+			"height": 42,
+			"id": "Agama-note-9b67b98d-875a-49d7-ad75-a3349c7252ab",
 			"position": {
-				"x": 2571,
-				"y": 882
+				"x": 675,
+				"y": 130.9999999999999
 			},
-			"type": "assignment",
+			"type": "notes",
 			"data": {
-				"id": "Agama-assignment-Node-2d0b4ccb-0fe8-489c-8007-81f60bc7a24f",
-				"type": "Agama-assignment-Node",
-				"parentId": "Agama-when-Node-ff3fa227-981d-493a-a17d-e859608a4bd0",
-				"whenCondition": "WhenTrue",
-				"inRepeatBlock": false,
+				"id": "Agama-note-9b67b98d-875a-49d7-ad75-a3349c7252ab",
+				"type": "Agama-note",
+				"notes": "Retrieving email address entered by user on UI. ",
 				"position": {
-					"x": 2571,
-					"y": 882
-				},
-				"agamaData": {
-					"id": "Agama-assignment-Node-2d0b4ccb-0fe8-489c-8007-81f60bc7a24f",
-					"parentId": "Agama-when-Node-ff3fa227-981d-493a-a17d-e859608a4bd0",
-					"type": "Agama-assignment-Node",
-					"displayName": "",
-					"hasComment": true,
-					"comment": "Assign registered user data to a object attributes",
-					"whenCondition": "WhenTrue",
-					"inRepeatBlock": false,
-					"assignments": [
-						{
-							"variableTypeCheck": false,
-							"assignmentExpression": "registrationResult.data",
-							"assignedVariableName": "userData"
-						},
-						{
-							"variableTypeCheck": false,
-							"assignmentExpression": "email",
-							"assignedVariableName": "userData.email"
-						}
-					],
-					"nodeIcon": "material-symbols:equal"
+					"x": 675,
+					"y": 130.9999999999999
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 2571,
-				"y": 882
+				"x": 675,
+				"y": 130.9999999999999
 			},
 			"dragging": false
 		},
 		{
-			"width": 210,
-			"height": 140,
-			"id": "Agama-when-Node-ff3fa227-981d-493a-a17d-e859608a4bd0",
+			"width": 270,
+			"height": 42,
+			"id": "Agama-note-a700c8a0-5dc0-47e3-99d4-8c4ff2f73ebd",
 			"position": {
-				"x": 2457,
-				"y": 652
+				"x": -7,
+				"y": -101
 			},
-			"parentId": "Agama-trigger-Node-eb0118b1-a540-4413-8b5e-459f11b1c750",
-			"type": "when",
+			"type": "notes",
 			"data": {
-				"id": "Agama-when-Node-ff3fa227-981d-493a-a17d-e859608a4bd0",
-				"type": "Agama-when-Node",
-				"parentId": "Agama-trigger-Node-eb0118b1-a540-4413-8b5e-459f11b1c750",
-				"whenCondition": "",
-				"inRepeatBlock": false,
+				"id": "Agama-note-a700c8a0-5dc0-47e3-99d4-8c4ff2f73ebd",
+				"type": "Agama-note",
+				"notes": "The email authentication flow starts from here.",
 				"position": {
-					"x": 2457,
-					"y": 652
-				},
-				"agamaData": {
-					"id": "Agama-when-Node-ff3fa227-981d-493a-a17d-e859608a4bd0",
-					"parentId": "Agama-trigger-Node-eb0118b1-a540-4413-8b5e-459f11b1c750",
-					"type": "Agama-when-Node",
-					"variableField": "registrationResult.success",
-					"conditionInputField": "is",
-					"valueField": "true",
-					"comment": "When user registration is successful",
-					"hasComment": true,
-					"inRepeatBlock": false,
-					"hasSuccess": true
+					"x": -7,
+					"y": -101
 				},
-				"handles": [
-					"Agama-when-Node-ff3fa227-981d-493a-a17d-e859608a4bd0.FAILURE",
-					"Agama-when-Node-ff3fa227-981d-493a-a17d-e859608a4bd0.SUCCESS"
-				],
 				"skake": false
 			},
 			"selected": false,
-			"dragging": false,
 			"positionAbsolute": {
-				"x": 2457,
-				"y": 652
-			}
-		},
-		{
-			"width": 170,
-			"height": 124,
-			"id": "Agama-trigger-Node-eb0118b1-a540-4413-8b5e-459f11b1c750",
-			"position": {
-				"x": 2257,
-				"y": 598
-			},
-			"type": "trigger",
-			"data": {
-				"id": "Agama-trigger-Node-eb0118b1-a540-4413-8b5e-459f11b1c750",
-				"type": "Agama-trigger-Node",
-				"parentId": "Agama-assignment-Node-4e7c94c3-ea51-4bab-bb36-52fc5a88f409",
-				"whenCondition": "",
-				"inRepeatBlock": false,
-				"position": {
-					"x": 2257,
-					"y": 598
-				},
-				"agamaData": {
-					"id": "Agama-trigger-Node-eb0118b1-a540-4413-8b5e-459f11b1c750",
-					"parentId": "Agama-assignment-Node-4e7c94c3-ea51-4bab-bb36-52fc5a88f409",
-					"type": "Agama-trigger-Node",
-					"displayName": "",
-					"hasComment": true,
-					"comment": "Run sub-routine to register user with email input",
-					"whenCondition": "",
-					"inRepeatBlock": false,
-					"nodeIcon": "fluent-mdl2:trigger-approval",
-					"flowFileName": "org.gluu.agama.smtp.registration",
-					"arguments": [
-						"emailObj"
-					],
-					"asssignedVariableName": "registrationResult",
-					"exceptionVariableField": ""
-				},
-				"skake": false
-			},
-			"selected": false,
-			"dragging": false,
-			"positionAbsolute": {
-				"x": 2257,
-				"y": 598
-			}
-		},
-		{
-			"width": 170,
-			"height": 124,
-			"id": "Agama-assignment-Node-4e7c94c3-ea51-4bab-bb36-52fc5a88f409",
-			"position": {
-				"x": 2057,
-				"y": 598
-			},
-			"type": "assignment",
-			"data": {
-				"id": "Agama-assignment-Node-4e7c94c3-ea51-4bab-bb36-52fc5a88f409",
-				"type": "Agama-assignment-Node",
-				"parentId": "Agama-log-Node-372963d4-4f3d-4908-8d97-5a7637a18f97",
-				"whenCondition": "",
-				"inRepeatBlock": false,
-				"position": {
-					"x": 2057,
-					"y": 598
-				},
-				"agamaData": {
-					"id": "Agama-assignment-Node-4e7c94c3-ea51-4bab-bb36-52fc5a88f409",
-					"parentId": "Agama-log-Node-372963d4-4f3d-4908-8d97-5a7637a18f97",
-					"type": "Agama-assignment-Node",
-					"displayName": "",
-					"hasComment": true,
-					"comment": "Create object to register user with email input",
-					"whenCondition": "",
-					"inRepeatBlock": false,
-					"assignments": [
-						{
-							"variableTypeCheck": false,
-							"assignmentExpression": "{ email: email }",
-							"assignedVariableName": "emailObj"
-						}
-					],
-					"nodeIcon": "material-symbols:equal"
-				},
-				"skake": false
-			},
-			"selected": false,
-			"dragging": false,
-			"positionAbsolute": {
-				"x": 2057,
-				"y": 598
-			}
-		},
-		{
-			"width": 170,
-			"height": 124,
-			"id": "Agama-log-Node-372963d4-4f3d-4908-8d97-5a7637a18f97",
-			"position": {
-				"x": 1857,
-				"y": 598
-			},
-			"type": "log",
-			"data": {
-				"id": "Agama-log-Node-372963d4-4f3d-4908-8d97-5a7637a18f97",
-				"type": "Agama-log-Node",
-				"parentId": "Agama-when-Node-668c75bc-6de9-47a2-9a50-173709df9f96",
-				"whenCondition": "WhenTrue",
-				"inRepeatBlock": false,
-				"position": {
-					"x": 1857,
-					"y": 598
-				},
-				"agamaData": {
-					"id": "Agama-log-Node-372963d4-4f3d-4908-8d97-5a7637a18f97",
-					"parentId": "Agama-when-Node-668c75bc-6de9-47a2-9a50-173709df9f96",
-					"type": "Agama-log-Node",
-					"displayName": "",
-					"hasComment": true,
-					"comment": "E-mail verification passed, initiating user provisioning flow",
-					"whenCondition": "WhenTrue",
-					"inRepeatBlock": false,
-					"logMessage": "\"E-mail verification passed, initiating user provisioning flow\"",
-					"logLevel": "info",
-					"nodeIcon": "octicon:log-16"
-				},
-				"skake": false
-			},
-			"selected": false,
-			"dragging": false,
-			"positionAbsolute": {
-				"x": 1857,
-				"y": 598
-			}
-		},
-		{
-			"width": 210,
-			"height": 140,
-			"id": "Agama-when-Node-668c75bc-6de9-47a2-9a50-173709df9f96",
-			"position": {
-				"x": 1744,
-				"y": 368
-			},
-			"parentId": "Agama-trigger-Node-26b8ffdf-d980-4cfa-9885-5bd402095913",
-			"type": "when",
-			"data": {
-				"id": "Agama-when-Node-668c75bc-6de9-47a2-9a50-173709df9f96",
-				"type": "Agama-when-Node",
-				"parentId": "Agama-trigger-Node-26b8ffdf-d980-4cfa-9885-5bd402095913",
-				"whenCondition": "",
-				"inRepeatBlock": false,
-				"position": {
-					"x": 1744,
-					"y": 368
-				},
-				"agamaData": {
-					"id": "Agama-when-Node-668c75bc-6de9-47a2-9a50-173709df9f96",
-					"parentId": "Agama-trigger-Node-26b8ffdf-d980-4cfa-9885-5bd402095913",
-					"type": "Agama-when-Node",
-					"variableField": "emailVerificationResult.success",
-					"conditionInputField": "is",
-					"valueField": "true",
-					"comment": "If email data is valid",
-					"hasComment": true,
-					"inRepeatBlock": false,
-					"hasSuccess": true,
-					"hasFailure": true
-				},
-				"handles": [
-					"Agama-when-Node-668c75bc-6de9-47a2-9a50-173709df9f96.FAILURE",
-					"Agama-when-Node-668c75bc-6de9-47a2-9a50-173709df9f96.SUCCESS"
-				],
-				"skake": false
-			},
-			"selected": false,
-			"dragging": false,
-			"positionAbsolute": {
-				"x": 1744,
-				"y": 368
-			}
-		},
-		{
-			"width": 170,
-			"height": 124,
-			"id": "Agama-trigger-Node-26b8ffdf-d980-4cfa-9885-5bd402095913",
-			"position": {
-				"x": 1544,
-				"y": 314
-			},
-			"type": "trigger",
-			"data": {
-				"id": "Agama-trigger-Node-26b8ffdf-d980-4cfa-9885-5bd402095913",
-				"type": "Agama-trigger-Node",
-				"parentId": "Agama-when-Node-463bd034-349f-4878-8ff1-8de69079fc66",
-				"whenCondition": "WhenTrue",
-				"inRepeatBlock": false,
-				"position": {
-					"x": 1544,
-					"y": 314
-				},
-				"agamaData": {
-					"id": "Agama-trigger-Node-26b8ffdf-d980-4cfa-9885-5bd402095913",
-					"parentId": "Agama-when-Node-463bd034-349f-4878-8ff1-8de69079fc66",
-					"type": "Agama-trigger-Node",
-					"displayName": "",
-					"hasComment": true,
-					"comment": "Trigger sub-routine to verify email",
-					"whenCondition": "WhenTrue",
-					"inRepeatBlock": false,
-					"nodeIcon": "fluent-mdl2:trigger-approval",
-					"flowFileName": "org.gluu.agama.smtp.emailVerification",
-					"arguments": [
-						"email",
-						"false",
-						"userData.context"
-					],
-					"asssignedVariableName": "emailVerificationResult",
-					"exceptionVariableField": ""
-				},
-				"skake": false
-			},
-			"selected": false,
-			"dragging": false,
-			"positionAbsolute": {
-				"x": 1544,
-				"y": 314
-			}
-		},
-		{
-			"width": 210,
-			"height": 140,
-			"id": "Agama-when-Node-463bd034-349f-4878-8ff1-8de69079fc66",
-			"position": {
-				"x": 1431,
-				"y": 84
-			},
-			"parentId": "Agama-assignment-Node-017d0486-ed7d-4f9a-bf05-128e5e386dca",
-			"type": "when",
-			"data": {
-				"id": "Agama-when-Node-463bd034-349f-4878-8ff1-8de69079fc66",
-				"type": "Agama-when-Node",
-				"parentId": "Agama-assignment-Node-017d0486-ed7d-4f9a-bf05-128e5e386dca",
-				"whenCondition": "",
-				"inRepeatBlock": false,
-				"position": {
-					"x": 1431,
-					"y": 84
-				},
-				"agamaData": {
-					"id": "Agama-when-Node-463bd034-349f-4878-8ff1-8de69079fc66",
-					"parentId": "Agama-assignment-Node-017d0486-ed7d-4f9a-bf05-128e5e386dca",
-					"type": "Agama-when-Node",
-					"variableField": "emailUnknown",
-					"conditionInputField": "is",
-					"valueField": "true",
-					"hasComment": true,
-					"inRepeatBlock": false,
-					"hasSuccess": true,
-					"hasFailure": true
-				},
-				"handles": [
-					"Agama-when-Node-463bd034-349f-4878-8ff1-8de69079fc66.FAILURE",
-					"Agama-when-Node-463bd034-349f-4878-8ff1-8de69079fc66.SUCCESS"
-				],
-				"skake": false
-			},
-			"selected": false,
-			"dragging": false,
-			"positionAbsolute": {
-				"x": 1431,
-				"y": 84
-			}
-		},
-		{
-			"width": 170,
-			"height": 124,
-			"id": "Agama-assignment-Node-017d0486-ed7d-4f9a-bf05-128e5e386dca",
-			"position": {
-				"x": 1231,
-				"y": 30
-			},
-			"type": "assignment",
-			"data": {
-				"id": "Agama-assignment-Node-017d0486-ed7d-4f9a-bf05-128e5e386dca",
-				"type": "Agama-assignment-Node",
-				"parentId": "Agama-call-Node-0e957456-a083-4cc4-8db4-0931094a2a6a",
-				"whenCondition": "",
-				"inRepeatBlock": false,
-				"position": {
-					"x": 1231,
-					"y": 30
-				},
-				"agamaData": {
-					"id": "Agama-assignment-Node-017d0486-ed7d-4f9a-bf05-128e5e386dca",
-					"parentId": "Agama-call-Node-0e957456-a083-4cc4-8db4-0931094a2a6a",
-					"type": "Agama-assignment-Node",
-					"displayName": "",
-					"hasComment": true,
-					"comment": "1. Logic to determine if user email is already registered\n2. Initialize location, timezone info from UI to user-data",
-					"whenCondition": "",
-					"inRepeatBlock": false,
-					"assignments": [
-						{
-							"variableTypeCheck": false,
-							"assignmentExpression": "userData.empty",
-							"assignedVariableName": "emailUnknown"
-						},
-						{
-							"variableTypeCheck": false,
-							"assignmentExpression": "{ location: uiInput.location, timeZone: uiInput.zone, device: uiInput.device }",
-							"assignedVariableName": "userData.context"
-						}
-					],
-					"nodeIcon": "material-symbols:equal"
-				},
-				"skake": false
-			},
-			"selected": false,
-			"dragging": false,
-			"positionAbsolute": {
-				"x": 1231,
-				"y": 30
-			}
-		},
-		{
-			"width": 170,
-			"height": 124,
-			"id": "Agama-call-Node-0e957456-a083-4cc4-8db4-0931094a2a6a",
-			"position": {
-				"x": 1031,
-				"y": 30
-			},
-			"type": "call",
-			"data": {
-				"id": "Agama-call-Node-0e957456-a083-4cc4-8db4-0931094a2a6a",
-				"type": "Agama-call-Node",
-				"parentId": "Agama-call-Node-f38bee24-0d1f-4603-af44-ac82eb043de7",
-				"whenCondition": "",
-				"inRepeatBlock": false,
-				"position": {
-					"x": 1031,
-					"y": 30
-				},
-				"agamaData": {
-					"id": "Agama-call-Node-0e957456-a083-4cc4-8db4-0931094a2a6a",
-					"parentId": "Agama-call-Node-f38bee24-0d1f-4603-af44-ac82eb043de7",
-					"type": "Agama-call-Node",
-					"displayName": "",
-					"hasComment": true,
-					"comment": "Get User Details using Email Service",
-					"javaClassName": "emailService",
-					"javaMethodName": "getUserEntity",
-					"javaVariableName": "emailService",
-					"exceptionVariableField": "",
-					"callType": "Call method on instance",
-					"whenCondition": "",
-					"inRepeatBlock": false,
-					"arguments": [
-						"email"
-					],
-					"nodeIcon": "material-symbols:code",
-					"asssignedVariableName": "userData"
-				},
-				"skake": false
-			},
-			"selected": false,
-			"dragging": false,
-			"positionAbsolute": {
-				"x": 1031,
-				"y": 30
-			}
-		},
-		{
-			"width": 170,
-			"height": 124,
-			"id": "Agama-call-Node-f38bee24-0d1f-4603-af44-ac82eb043de7",
-			"position": {
-				"x": 830,
-				"y": 30
-			},
-			"type": "call",
-			"data": {
-				"id": "Agama-call-Node-f38bee24-0d1f-4603-af44-ac82eb043de7",
-				"type": "Agama-call-Node",
-				"parentId": "Agama-assignment-Node-721ca521-916e-4f4d-a4a2-de43c4d02841",
-				"whenCondition": "",
-				"inRepeatBlock": false,
-				"position": {
-					"x": 830,
-					"y": 30
-				},
-				"agamaData": {
-					"id": "Agama-call-Node-f38bee24-0d1f-4603-af44-ac82eb043de7",
-					"parentId": "Agama-assignment-Node-721ca521-916e-4f4d-a4a2-de43c4d02841",
-					"type": "Agama-call-Node",
-					"displayName": "",
-					"hasComment": true,
-					"comment": "Create an instance Email Service",
-					"javaClassName": "org.gluu.agama.smtp.EmailService",
-					"javaMethodName": "getInstance",
-					"javaVariableName": "",
-					"exceptionVariableField": "",
-					"callType": "Call static method",
-					"whenCondition": "",
-					"inRepeatBlock": false,
-					"arguments": [
-						""
-					],
-					"nodeIcon": "material-symbols:code",
-					"asssignedVariableName": "emailService"
-				},
-				"skake": false
-			},
-			"selected": false,
-			"dragging": false,
-			"positionAbsolute": {
-				"x": 830,
-				"y": 30
-			}
-		},
-		{
-			"width": 170,
-			"height": 124,
-			"id": "Agama-assignment-Node-721ca521-916e-4f4d-a4a2-de43c4d02841",
-			"position": {
-				"x": 630,
-				"y": 30
-			},
-			"type": "assignment",
-			"data": {
-				"id": "Agama-assignment-Node-721ca521-916e-4f4d-a4a2-de43c4d02841",
-				"type": "Agama-assignment-Node",
-				"parentId": "Agama-rrf-Node-d4e4294a-99d9-4baa-a7ac-56c87c49741d",
-				"whenCondition": "",
-				"inRepeatBlock": false,
-				"position": {
-					"x": 630,
-					"y": 30
-				},
-				"agamaData": {
-					"id": "Agama-assignment-Node-721ca521-916e-4f4d-a4a2-de43c4d02841",
-					"parentId": "Agama-rrf-Node-d4e4294a-99d9-4baa-a7ac-56c87c49741d",
-					"type": "Agama-assignment-Node",
-					"displayName": "",
-					"hasComment": true,
-					"comment": "Assign user email input to a variable",
-					"whenCondition": "",
-					"inRepeatBlock": false,
-					"assignments": [
-						{
-							"variableTypeCheck": false,
-							"assignmentExpression": "uiInput.email",
-							"assignedVariableName": "email"
-						}
-					],
-					"nodeIcon": "material-symbols:equal"
-				},
-				"skake": false
-			},
-			"selected": false,
-			"dragging": false,
-			"positionAbsolute": {
-				"x": 630,
-				"y": 30
-			}
-		},
-		{
-			"width": 170,
-			"height": 124,
-			"id": "Agama-rrf-Node-d4e4294a-99d9-4baa-a7ac-56c87c49741d",
-			"position": {
-				"x": 430,
-				"y": 30
-			},
-			"type": "rrf",
-			"data": {
-				"id": "Agama-rrf-Node-d4e4294a-99d9-4baa-a7ac-56c87c49741d",
-				"type": "Agama-rrf-Node",
-				"parentId": "Agama-assignment-Node-2cc7c857-fc27-4680-ad39-c205bf88f997",
-				"whenCondition": "",
-				"inRepeatBlock": false,
-				"position": {
-					"x": 430,
-					"y": 30
-				},
-				"agamaData": {
-					"id": "Agama-rrf-Node-d4e4294a-99d9-4baa-a7ac-56c87c49741d",
-					"parentId": "Agama-assignment-Node-2cc7c857-fc27-4680-ad39-c205bf88f997",
-					"type": "Agama-rrf-Node",
-					"displayName": "",
-					"hasComment": true,
-					"comment": "Retrieve user email address from UI",
-					"whenCondition": "",
-					"inRepeatBlock": false,
-					"assignments": [],
-					"nodeIcon": "ph:globe-simple",
-					"templatePath": "main.ftlh",
-					"asssignedVariableName": "uiInput",
-					"arguments": "emailObj"
-				},
-				"skake": false
-			},
-			"selected": false,
-			"dragging": false,
-			"positionAbsolute": {
-				"x": 430,
-				"y": 30
-			}
+				"x": -7,
+				"y": -101
+			},
+			"dragging": false
 		},
 		{
 			"width": 170,
@@ -1540,7 +772,7 @@
 					"assignments": [
 						{
 							"variableTypeCheck": false,
-							"assignmentExpression": "{ email: emailHint, captureLocation: conf.captureLocation }",
+							"assignmentExpression": "{ email: emailHint, captureLocation: conf.captureLocation, errorMessage: \"\" }",
 							"assignedVariableName": "emailObj"
 						}
 					],
@@ -1617,199 +849,10 @@
 			}
 		},
 		{
-			"id": "Agama-assignment-Node-2cc7c857-fc27-4680-ad39-c205bf88f997-Agama-rrf-Node-d4e4294a-99d9-4baa-a7ac-56c87c49741d-dd65a4b8-18d2-457a-ac06-2e7cd821abda",
+			"id": "Agama-assignment-Node-2cc7c857-fc27-4680-ad39-c205bf88f997-Agama-repeat-Node-34862b8f-6f01-41d7-b101-138a1142008c-14873fcb-5091-4047-8eb3-f0afb26e7142",
 			"type": "straight",
 			"source": "Agama-assignment-Node-2cc7c857-fc27-4680-ad39-c205bf88f997",
-			"target": "Agama-rrf-Node-d4e4294a-99d9-4baa-a7ac-56c87c49741d",
-			"label": "",
-			"labelBgPadding": [
-				8,
-				4
-			],
-			"labelBgBorderRadius": 4,
-			"labelBgStyle": {
-				"fill": "#FFCC00",
-				"color": "#fff",
-				"fillOpacity": 0.7
-			}
-		},
-		{
-			"id": "Agama-rrf-Node-d4e4294a-99d9-4baa-a7ac-56c87c49741d-Agama-assignment-Node-721ca521-916e-4f4d-a4a2-de43c4d02841-d91aa5d3-9993-4d83-8ec7-9ac21d702bbb",
-			"type": "straight",
-			"source": "Agama-rrf-Node-d4e4294a-99d9-4baa-a7ac-56c87c49741d",
-			"target": "Agama-assignment-Node-721ca521-916e-4f4d-a4a2-de43c4d02841",
-			"label": "",
-			"labelBgPadding": [
-				8,
-				4
-			],
-			"labelBgBorderRadius": 4,
-			"labelBgStyle": {
-				"fill": "#FFCC00",
-				"color": "#fff",
-				"fillOpacity": 0.7
-			}
-		},
-		{
-			"id": "Agama-assignment-Node-721ca521-916e-4f4d-a4a2-de43c4d02841-Agama-call-Node-f38bee24-0d1f-4603-af44-ac82eb043de7-a84b792e-aa37-4325-9cb1-29e0470ecdc4",
-			"type": "straight",
-			"source": "Agama-assignment-Node-721ca521-916e-4f4d-a4a2-de43c4d02841",
-			"target": "Agama-call-Node-f38bee24-0d1f-4603-af44-ac82eb043de7",
-			"label": "",
-			"labelBgPadding": [
-				8,
-				4
-			],
-			"labelBgBorderRadius": 4,
-			"labelBgStyle": {
-				"fill": "#FFCC00",
-				"color": "#fff",
-				"fillOpacity": 0.7
-			}
-		},
-		{
-			"id": "Agama-call-Node-f38bee24-0d1f-4603-af44-ac82eb043de7-Agama-call-Node-0e957456-a083-4cc4-8db4-0931094a2a6a-aea2cadf-c60e-4eb3-abe1-ed194d5ec774",
-			"type": "straight",
-			"source": "Agama-call-Node-f38bee24-0d1f-4603-af44-ac82eb043de7",
-			"target": "Agama-call-Node-0e957456-a083-4cc4-8db4-0931094a2a6a",
-			"label": "",
-			"labelBgPadding": [
-				8,
-				4
-			],
-			"labelBgBorderRadius": 4,
-			"labelBgStyle": {
-				"fill": "#FFCC00",
-				"color": "#fff",
-				"fillOpacity": 0.7
-			}
-		},
-		{
-			"id": "Agama-call-Node-0e957456-a083-4cc4-8db4-0931094a2a6a-Agama-assignment-Node-017d0486-ed7d-4f9a-bf05-128e5e386dca-67ccc9a4-68b5-4a05-8046-c030a85e7cbc",
-			"type": "straight",
-			"source": "Agama-call-Node-0e957456-a083-4cc4-8db4-0931094a2a6a",
-			"target": "Agama-assignment-Node-017d0486-ed7d-4f9a-bf05-128e5e386dca",
-			"label": "",
-			"labelBgPadding": [
-				8,
-				4
-			],
-			"labelBgBorderRadius": 4,
-			"labelBgStyle": {
-				"fill": "#FFCC00",
-				"color": "#fff",
-				"fillOpacity": 0.7
-			}
-		},
-		{
-			"id": "Agama-assignment-Node-017d0486-ed7d-4f9a-bf05-128e5e386dca-Agama-when-Node-463bd034-349f-4878-8ff1-8de69079fc66-ba5988a1-2cfe-4107-a5d6-ea00791fdfd3",
-			"type": "straight",
-			"source": "Agama-assignment-Node-017d0486-ed7d-4f9a-bf05-128e5e386dca",
-			"target": "Agama-when-Node-463bd034-349f-4878-8ff1-8de69079fc66",
-			"label": "",
-			"labelBgPadding": [
-				8,
-				4
-			],
-			"labelBgBorderRadius": 4,
-			"labelBgStyle": {
-				"fill": "#FFCC00",
-				"color": "#fff",
-				"fillOpacity": 0.7
-			}
-		},
-		{
-			"id": "Agama-when-Node-463bd034-349f-4878-8ff1-8de69079fc66-Agama-trigger-Node-26b8ffdf-d980-4cfa-9885-5bd402095913-6d8946c0-1515-4af2-a3d6-d80a7c4afc4d",
-			"type": "straight",
-			"source": "Agama-when-Node-463bd034-349f-4878-8ff1-8de69079fc66",
-			"target": "Agama-trigger-Node-26b8ffdf-d980-4cfa-9885-5bd402095913",
-			"label": "Condition met",
-			"labelBgPadding": [
-				8,
-				4
-			],
-			"labelBgBorderRadius": 4,
-			"labelBgStyle": {
-				"fill": "#FFCC00",
-				"color": "#fff",
-				"fillOpacity": 0.7
-			},
-			"sourceHandle": "Agama-when-Node-463bd034-349f-4878-8ff1-8de69079fc66.SUCCESS"
-		},
-		{
-			"id": "Agama-trigger-Node-26b8ffdf-d980-4cfa-9885-5bd402095913-Agama-when-Node-668c75bc-6de9-47a2-9a50-173709df9f96-700cf2cc-bb28-42b4-b82f-4660452738a2",
-			"type": "straight",
-			"source": "Agama-trigger-Node-26b8ffdf-d980-4cfa-9885-5bd402095913",
-			"target": "Agama-when-Node-668c75bc-6de9-47a2-9a50-173709df9f96",
-			"label": "",
-			"labelBgPadding": [
-				8,
-				4
-			],
-			"labelBgBorderRadius": 4,
-			"labelBgStyle": {
-				"fill": "#FFCC00",
-				"color": "#fff",
-				"fillOpacity": 0.7
-			}
-		},
-		{
-			"id": "Agama-when-Node-668c75bc-6de9-47a2-9a50-173709df9f96-Agama-log-Node-372963d4-4f3d-4908-8d97-5a7637a18f97-5d70f4c2-a2c9-4041-a0bd-0a811bfa6775",
-			"type": "straight",
-			"source": "Agama-when-Node-668c75bc-6de9-47a2-9a50-173709df9f96",
-			"target": "Agama-log-Node-372963d4-4f3d-4908-8d97-5a7637a18f97",
-			"label": "Condition met",
-			"labelBgPadding": [
-				8,
-				4
-			],
-			"labelBgBorderRadius": 4,
-			"labelBgStyle": {
-				"fill": "#FFCC00",
-				"color": "#fff",
-				"fillOpacity": 0.7
-			},
-			"sourceHandle": "Agama-when-Node-668c75bc-6de9-47a2-9a50-173709df9f96.SUCCESS"
-		},
-		{
-			"id": "Agama-log-Node-372963d4-4f3d-4908-8d97-5a7637a18f97-Agama-assignment-Node-4e7c94c3-ea51-4bab-bb36-52fc5a88f409-326be3e7-d1fc-4b3b-80c6-c6aa6c38ee16",
-			"type": "straight",
-			"source": "Agama-log-Node-372963d4-4f3d-4908-8d97-5a7637a18f97",
-			"target": "Agama-assignment-Node-4e7c94c3-ea51-4bab-bb36-52fc5a88f409",
-			"label": "",
-			"labelBgPadding": [
-				8,
-				4
-			],
-			"labelBgBorderRadius": 4,
-			"labelBgStyle": {
-				"fill": "#FFCC00",
-				"color": "#fff",
-				"fillOpacity": 0.7
-			}
-		},
-		{
-			"id": "Agama-assignment-Node-4e7c94c3-ea51-4bab-bb36-52fc5a88f409-Agama-trigger-Node-eb0118b1-a540-4413-8b5e-459f11b1c750-0a358932-9094-4a92-baf1-1d2dd70c44c1",
-			"type": "straight",
-			"source": "Agama-assignment-Node-4e7c94c3-ea51-4bab-bb36-52fc5a88f409",
-			"target": "Agama-trigger-Node-eb0118b1-a540-4413-8b5e-459f11b1c750",
-			"label": "",
-			"labelBgPadding": [
-				8,
-				4
-			],
-			"labelBgBorderRadius": 4,
-			"labelBgStyle": {
-				"fill": "#FFCC00",
-				"color": "#fff",
-				"fillOpacity": 0.7
-			}
-		},
-		{
-			"id": "Agama-trigger-Node-eb0118b1-a540-4413-8b5e-459f11b1c750-Agama-when-Node-ff3fa227-981d-493a-a17d-e859608a4bd0-acb2b7c9-a68f-45c2-b8df-c2ac671e9b24",
-			"type": "straight",
-			"source": "Agama-trigger-Node-eb0118b1-a540-4413-8b5e-459f11b1c750",
-			"target": "Agama-when-Node-ff3fa227-981d-493a-a17d-e859608a4bd0",
+			"target": "Agama-repeat-Node-34862b8f-6f01-41d7-b101-138a1142008c",
 			"label": "",
 			"labelBgPadding": [
 				8,
@@ -1823,11 +866,11 @@
 			}
 		},
 		{
-			"id": "Agama-when-Node-ff3fa227-981d-493a-a17d-e859608a4bd0-Agama-assignment-Node-2d0b4ccb-0fe8-489c-8007-81f60bc7a24f-1dc99ad7-fb59-4e2c-8222-6a956934ee62",
+			"id": "Agama-repeat-Node-34862b8f-6f01-41d7-b101-138a1142008c-Agama-rrf-Node-34ad90cb-5100-4b88-bb7e-116120f609ce-34910763-b5fc-492f-aabe-2176c33df910",
 			"type": "straight",
-			"source": "Agama-when-Node-ff3fa227-981d-493a-a17d-e859608a4bd0",
-			"target": "Agama-assignment-Node-2d0b4ccb-0fe8-489c-8007-81f60bc7a24f",
-			"label": "Condition met",
+			"source": "Agama-repeat-Node-34862b8f-6f01-41d7-b101-138a1142008c",
+			"target": "Agama-rrf-Node-34ad90cb-5100-4b88-bb7e-116120f609ce",
+			"label": "In Block",
 			"labelBgPadding": [
 				8,
 				4
@@ -1838,30 +881,13 @@
 				"color": "#fff",
 				"fillOpacity": 0.7
 			},
-			"sourceHandle": "Agama-when-Node-ff3fa227-981d-493a-a17d-e859608a4bd0.SUCCESS"
-		},
-		{
-			"id": "Agama-assignment-Node-2d0b4ccb-0fe8-489c-8007-81f60bc7a24f-Agama-rrf-Node-d7e21b2c-d192-4773-bdda-08962c9bf58f-cab17e3e-38a2-4345-b228-36a6ba1e3dcb",
-			"type": "straight",
-			"source": "Agama-assignment-Node-2d0b4ccb-0fe8-489c-8007-81f60bc7a24f",
-			"target": "Agama-rrf-Node-d7e21b2c-d192-4773-bdda-08962c9bf58f",
-			"label": "",
-			"labelBgPadding": [
-				8,
-				4
-			],
-			"labelBgBorderRadius": 4,
-			"labelBgStyle": {
-				"fill": "#FFCC00",
-				"color": "#fff",
-				"fillOpacity": 0.7
-			}
+			"sourceHandle": "Agama-repeat-Node-34862b8f-6f01-41d7-b101-138a1142008c.InRepeatBlock"
 		},
 		{
-			"id": "Agama-rrf-Node-d7e21b2c-d192-4773-bdda-08962c9bf58f-Agama-when-Node-a432eb10-da16-4d7e-8624-3c0aaace647b-694582e9-42b1-4283-8ead-5497de04ea21",
+			"id": "Agama-rrf-Node-34ad90cb-5100-4b88-bb7e-116120f609ce-Agama-assignment-Node-d07b1e21-f2fe-47f7-bcfd-e6b782ab4b0f-8a897b88-eae1-46f5-9316-07e6cf08d859",
 			"type": "straight",
-			"source": "Agama-rrf-Node-d7e21b2c-d192-4773-bdda-08962c9bf58f",
-			"target": "Agama-when-Node-a432eb10-da16-4d7e-8624-3c0aaace647b",
+			"source": "Agama-rrf-Node-34ad90cb-5100-4b88-bb7e-116120f609ce",
+			"target": "Agama-assignment-Node-d07b1e21-f2fe-47f7-bcfd-e6b782ab4b0f",
 			"label": "",
 			"labelBgPadding": [
 				8,
@@ -1875,28 +901,10 @@
 			}
 		},
 		{
-			"id": "Agama-when-Node-a432eb10-da16-4d7e-8624-3c0aaace647b-Agama-assignment-Node-20c7553f-b251-4636-83cb-443f7c4242b8-8437f71f-2e5a-44e6-b7e3-cec23ae43967",
-			"type": "straight",
-			"source": "Agama-when-Node-a432eb10-da16-4d7e-8624-3c0aaace647b",
-			"target": "Agama-assignment-Node-20c7553f-b251-4636-83cb-443f7c4242b8",
-			"label": "Condition met",
-			"labelBgPadding": [
-				8,
-				4
-			],
-			"labelBgBorderRadius": 4,
-			"labelBgStyle": {
-				"fill": "#FFCC00",
-				"color": "#fff",
-				"fillOpacity": 0.7
-			},
-			"sourceHandle": "Agama-when-Node-a432eb10-da16-4d7e-8624-3c0aaace647b.SUCCESS"
-		},
-		{
-			"id": "Agama-assignment-Node-20c7553f-b251-4636-83cb-443f7c4242b8-finish-f9d128eb-74ac-4d3c-a53d-4b4d604a225f-d6a3a063-e88c-4c2b-91c9-db11471a0faf",
+			"id": "Agama-assignment-Node-d07b1e21-f2fe-47f7-bcfd-e6b782ab4b0f-Agama-call-Node-58689efb-2c01-4374-b573-e1567b04b04a-c781de4b-f1d7-4f57-86ec-d24941ce7455",
 			"type": "straight",
-			"source": "Agama-assignment-Node-20c7553f-b251-4636-83cb-443f7c4242b8",
-			"target": "finish-f9d128eb-74ac-4d3c-a53d-4b4d604a225f",
+			"source": "Agama-assignment-Node-d07b1e21-f2fe-47f7-bcfd-e6b782ab4b0f",
+			"target": "Agama-call-Node-58689efb-2c01-4374-b573-e1567b04b04a",
 			"label": "",
 			"labelBgPadding": [
 				8,
@@ -1910,28 +918,10 @@
 			}
 		},
 		{
-			"id": "Agama-when-Node-668c75bc-6de9-47a2-9a50-173709df9f96-Agama-log-Node-09fa4386-5159-468b-8eea-51c288174396-6e0fd173-bf66-4ec9-8832-56702be6ff4c",
-			"type": "straight",
-			"source": "Agama-when-Node-668c75bc-6de9-47a2-9a50-173709df9f96",
-			"target": "Agama-log-Node-09fa4386-5159-468b-8eea-51c288174396",
-			"label": "",
-			"labelBgPadding": [
-				8,
-				4
-			],
-			"labelBgBorderRadius": 4,
-			"labelBgStyle": {
-				"fill": "#FFCC00",
-				"color": "#fff",
-				"fillOpacity": 0.7
-			},
-			"sourceHandle": "Agama-when-Node-668c75bc-6de9-47a2-9a50-173709df9f96.FAILURE"
-		},
-		{
-			"id": "Agama-log-Node-09fa4386-5159-468b-8eea-51c288174396-Agama-when-Node-c56ff785-3f40-40b7-83d4-5b6d13608bbf-216d0a4c-216a-44b6-96a4-9003bdd76ef9",
+			"id": "Agama-call-Node-58689efb-2c01-4374-b573-e1567b04b04a-Agama-call-Node-e1c99e34-9e8a-409a-bcf1-cb709302560d-b3ec3c84-6b9e-492a-acc0-e21f2f5d4706",
 			"type": "straight",
-			"source": "Agama-log-Node-09fa4386-5159-468b-8eea-51c288174396",
-			"target": "Agama-when-Node-c56ff785-3f40-40b7-83d4-5b6d13608bbf",
+			"source": "Agama-call-Node-58689efb-2c01-4374-b573-e1567b04b04a",
+			"target": "Agama-call-Node-e1c99e34-9e8a-409a-bcf1-cb709302560d",
 			"label": "",
 			"labelBgPadding": [
 				8,
@@ -1945,28 +935,10 @@
 			}
 		},
 		{
-			"id": "Agama-when-Node-463bd034-349f-4878-8ff1-8de69079fc66-Agama-log-Node-0bca696a-a0a6-4c3a-9664-8d7bf9100a44-e5aa78eb-b58a-4da8-ba85-970167b2bee2",
-			"type": "straight",
-			"source": "Agama-when-Node-463bd034-349f-4878-8ff1-8de69079fc66",
-			"target": "Agama-log-Node-0bca696a-a0a6-4c3a-9664-8d7bf9100a44",
-			"label": "",
-			"labelBgPadding": [
-				8,
-				4
-			],
-			"labelBgBorderRadius": 4,
-			"labelBgStyle": {
-				"fill": "#FFCC00",
-				"color": "#fff",
-				"fillOpacity": 0.7
-			},
-			"sourceHandle": "Agama-when-Node-463bd034-349f-4878-8ff1-8de69079fc66.FAILURE"
-		},
-		{
-			"id": "Agama-log-Node-0bca696a-a0a6-4c3a-9664-8d7bf9100a44-Agama-trigger-Node-3a16a396-2d98-4eba-8fc0-eb59af02c7d1-dd526fd2-817b-4e47-9972-7a1745e4e430",
+			"id": "Agama-call-Node-e1c99e34-9e8a-409a-bcf1-cb709302560d-Agama-assignment-Node-459e8300-529f-4716-819f-e1aae035f3ca-be5bbd0b-909a-4946-9f80-981f94d39ba9",
 			"type": "straight",
-			"source": "Agama-log-Node-0bca696a-a0a6-4c3a-9664-8d7bf9100a44",
-			"target": "Agama-trigger-Node-3a16a396-2d98-4eba-8fc0-eb59af02c7d1",
+			"source": "Agama-call-Node-e1c99e34-9e8a-409a-bcf1-cb709302560d",
+			"target": "Agama-assignment-Node-459e8300-529f-4716-819f-e1aae035f3ca",
 			"label": "",
 			"labelBgPadding": [
 				8,
@@ -1980,10 +952,10 @@
 			}
 		},
 		{
-			"id": "Agama-trigger-Node-3a16a396-2d98-4eba-8fc0-eb59af02c7d1-Agama-when-Node-ce35c4ba-e067-4247-9a3d-ba685765cb1a-a63d1c94-ff97-442b-88c3-a88f98ba6934",
+			"id": "Agama-assignment-Node-459e8300-529f-4716-819f-e1aae035f3ca-Agama-when-Node-2493baf6-a7d6-4f7f-ada5-017db9da4f81-4c920cf9-8d19-4244-9fd3-a5c532d852c2",
 			"type": "straight",
-			"source": "Agama-trigger-Node-3a16a396-2d98-4eba-8fc0-eb59af02c7d1",
-			"target": "Agama-when-Node-ce35c4ba-e067-4247-9a3d-ba685765cb1a",
+			"source": "Agama-assignment-Node-459e8300-529f-4716-819f-e1aae035f3ca",
+			"target": "Agama-when-Node-2493baf6-a7d6-4f7f-ada5-017db9da4f81",
 			"label": "",
 			"labelBgPadding": [
 				8,
@@ -1997,10 +969,10 @@
 			}
 		},
 		{
-			"id": "Agama-when-Node-ce35c4ba-e067-4247-9a3d-ba685765cb1a-Agama-assignment-Node-d5f2b9df-18d7-4f38-ab7d-cbb16bd05723-6952a902-895c-4fa9-9ff3-358ea3324c08",
+			"id": "Agama-when-Node-2493baf6-a7d6-4f7f-ada5-017db9da4f81-Agama-trigger-Node-8b98ffa4-8732-46cf-8bda-6f922379414c-ab952f0d-24f1-4fed-adab-3a934d154595",
 			"type": "straight",
-			"source": "Agama-when-Node-ce35c4ba-e067-4247-9a3d-ba685765cb1a",
-			"target": "Agama-assignment-Node-d5f2b9df-18d7-4f38-ab7d-cbb16bd05723",
+			"source": "Agama-when-Node-2493baf6-a7d6-4f7f-ada5-017db9da4f81",
+			"target": "Agama-trigger-Node-8b98ffa4-8732-46cf-8bda-6f922379414c",
 			"label": "Condition met",
 			"labelBgPadding": [
 				8,
@@ -2012,65 +984,13 @@
 				"color": "#fff",
 				"fillOpacity": 0.7
 			},
-			"sourceHandle": "Agama-when-Node-ce35c4ba-e067-4247-9a3d-ba685765cb1a.SUCCESS"
-		},
-		{
-			"id": "Agama-assignment-Node-d5f2b9df-18d7-4f38-ab7d-cbb16bd05723-finish-ef86cfc4-09e6-4f66-86bf-25acdaedd700-35cd1697-86e1-46e3-bf3f-99aca064b7ab",
-			"type": "straight",
-			"source": "Agama-assignment-Node-d5f2b9df-18d7-4f38-ab7d-cbb16bd05723",
-			"target": "finish-ef86cfc4-09e6-4f66-86bf-25acdaedd700",
-			"label": "",
-			"labelBgPadding": [
-				8,
-				4
-			],
-			"labelBgBorderRadius": 4,
-			"labelBgStyle": {
-				"fill": "#FFCC00",
-				"color": "#fff",
-				"fillOpacity": 0.7
-			}
-		},
-		{
-			"id": "Agama-when-Node-ce35c4ba-e067-4247-9a3d-ba685765cb1a-Agama-log-Node-1475f784-2410-468a-9644-37023510b2f3-aae22142-1d4c-4664-972f-1d49d0004559",
-			"type": "straight",
-			"source": "Agama-when-Node-ce35c4ba-e067-4247-9a3d-ba685765cb1a",
-			"target": "Agama-log-Node-1475f784-2410-468a-9644-37023510b2f3",
-			"label": "",
-			"labelBgPadding": [
-				8,
-				4
-			],
-			"labelBgBorderRadius": 4,
-			"labelBgStyle": {
-				"fill": "#FFCC00",
-				"color": "#fff",
-				"fillOpacity": 0.7
-			},
-			"sourceHandle": "Agama-when-Node-ce35c4ba-e067-4247-9a3d-ba685765cb1a.FAILURE"
-		},
-		{
-			"id": "Agama-log-Node-1475f784-2410-468a-9644-37023510b2f3-finish-abbe7fa4-7c2b-456c-8c76-9181bf973f8e-6c782212-24bc-4336-b846-022d616f963a",
-			"type": "straight",
-			"source": "Agama-log-Node-1475f784-2410-468a-9644-37023510b2f3",
-			"target": "finish-abbe7fa4-7c2b-456c-8c76-9181bf973f8e",
-			"label": "",
-			"labelBgPadding": [
-				8,
-				4
-			],
-			"labelBgBorderRadius": 4,
-			"labelBgStyle": {
-				"fill": "#FFCC00",
-				"color": "#fff",
-				"fillOpacity": 0.7
-			}
+			"sourceHandle": "Agama-when-Node-2493baf6-a7d6-4f7f-ada5-017db9da4f81.SUCCESS"
 		},
 		{
-			"id": "Agama-log-Node-09fa4386-5159-468b-8eea-51c288174396-finish-6afb4cd4-1b93-41d9-8777-c4716d568bed-891f8eba-a3f4-4061-a561-b9cc61d9b0f6",
+			"id": "Agama-trigger-Node-8b98ffa4-8732-46cf-8bda-6f922379414c-Agama-assignment-Node-69595972-81e8-44bd-a12e-841bc5f0dafc-62a92e5a-b59c-4ef8-b269-d4740ec0cdaa",
 			"type": "straight",
-			"source": "Agama-log-Node-09fa4386-5159-468b-8eea-51c288174396",
-			"target": "finish-6afb4cd4-1b93-41d9-8777-c4716d568bed",
+			"source": "Agama-trigger-Node-8b98ffa4-8732-46cf-8bda-6f922379414c",
+			"target": "Agama-assignment-Node-69595972-81e8-44bd-a12e-841bc5f0dafc",
 			"label": "",
 			"labelBgPadding": [
 				8,
@@ -2085,8 +1005,8 @@
 		}
 	],
 	"viewport": {
-		"x": -1278,
-		"y": 430,
-		"zoom": 1
+		"x": -863.8671547705076,
+		"y": 33.63525438757414,
+		"zoom": 1.0000000000000007
 	}
-}
+}
\ No newline at end of file

From 8ca46bb288be48d2f31344834ffc1314f5c0c2c5 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 12:19:16 +0530
Subject: [PATCH 15/32] feat: update org.gluu.agama.smtp.main.flow

---
 code/org.gluu.agama.smtp.main.flow | 76 ++++++++----------------------
 1 file changed, 19 insertions(+), 57 deletions(-)

diff --git a/code/org.gluu.agama.smtp.main.flow b/code/org.gluu.agama.smtp.main.flow
index e9762fb..b7f0af4 100644
--- a/code/org.gluu.agama.smtp.main.flow
+++ b/code/org.gluu.agama.smtp.main.flow
@@ -5,60 +5,22 @@ Flow org.gluu.agama.smtp.main
      Configs conf
      Inputs emailHint
 // Create and initialize variable to receive email input
-emailObj = { email: emailHint, captureLocation: conf.captureLocation }
-// Retrieve user email address from UI
-uiInput = RRF "main.ftlh" emailObj
-// Assign user email input to a variable
-email = uiInput.email
-// Create an instance Email Service
-emailService = Call org.gluu.agama.smtp.EmailService#getInstance
-// Get User Details using Email Service
-userData = Call emailService getUserEntity email
-// 1. Logic to determine if user email is already registered 2. Initialize location, timezone info from UI to user-data
-emailUnknown = userData.empty
-userData.context = { location: uiInput.location, timeZone: uiInput.zone, device: uiInput.device }
-When emailUnknown is true
-     // Trigger sub-routine to verify email
-     emailVerificationResult = Trigger org.gluu.agama.smtp.emailVerification email false userData.context
-     // If email data is valid
-     When emailVerificationResult.success is true
-          // E-mail verification passed, initiating user provisioning flow
-          Log "@info E-mail verification passed, initiating user provisioning flow"
-          // Create object to register user with email input
-          emailObj = { email: email }
-          // Run sub-routine to register user with email input
-          registrationResult = Trigger org.gluu.agama.smtp.registration emailObj
-          // When user registration is successful
-          When registrationResult.success is true
-               // Assign registered user data to a object attributes
-               userData = registrationResult.data
-               userData.email = email
-               // Show acknowledgement UI page for successful registration
-               acknowledgementInput = RRF "acknowledgement.ftlh" userData
-               // User clicks in continue button
-               When acknowledgementInput.ack is "continue"
-                    // Assign User Id (email) to a variable
-                    uid = userData.uid
-                    // Finish the flow successfully
-                    it_xyoef = {success:true, data: { userId: uid, uid: uid}}
-                    Finish it_xyoef
-     // The email verification is not successful
-     Log "@info Email verification is not successful"
-     // Email verification is unsuccessful
-     Finish emailVerificationResult
-// User with same email already exists
-Log "@info User with e-mail % is known" email
-// Run email verification sub-routine
-emailVerificationResult = Trigger org.gluu.agama.smtp.emailVerification email true userData.context
-// When email verification is successful
-When emailVerificationResult.success is true
-     // Assigning user id (email) to a variable
-     uid = userData.uid
-     // Email verification and hence authentication is successful
-     it_qxhss = {success:true, data: { userId: uid, uid: uid}}
-     Finish it_qxhss
-// Fail if credential enrollment or authenticator flow failed
-Log "@info Fail if credential enrollment or authenticator flow failed"
-// Credential enrollment or authenticator flow failed
-it_iocpl = {success:false, error: "Credential enrollment or authenticator flow failed"}
-Finish it_iocpl
+emailObj = { email: emailHint, captureLocation: conf.captureLocation, errorMessage: "" }
+// Iterate x times max
+max = Repeat 3 times max
+     // Retrieve user email address from UI
+     uiInput = RRF "main.ftlh" emailObj
+     // Assign user email input to a variable
+     email = uiInput.email
+     // Create an instance Email Service
+     emailService = Call org.gluu.agama.smtp.EmailService#getInstance 
+     // Get User Details using Email Service
+     userData = Call emailService getUserEntity email
+     // 1. Logic to determine if user email is already registered 2. Initialize location, timezone info from UI to user-data
+     emailUnknown = userData.empty
+     userData.context = { location: uiInput.location, timeZone: uiInput.zone, device: uiInput.device }
+     When emailUnknown is true
+          // Trigger sub-routine to verify email
+          emailVerificationResult = Trigger org.gluu.agama.smtp.emailVerification email false userData.context
+          // Reset error message to empty after email verification
+          emailObj.errorMessage = ""
\ No newline at end of file

From 534c9fb88ba1e3cc3ea14ccca7bd566abbbbe305 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 12:39:14 +0530
Subject: [PATCH 16/32] feat: update project.json


From c069714a436b525d203dbebbc88f5bf921edf3a1 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 12:39:17 +0530
Subject: [PATCH 17/32] feat: update org.gluu.agama.smtp.main.json

---
 code/org.gluu.agama.smtp.main.json | 698 +++++++++++++++++++++++++++--
 1 file changed, 667 insertions(+), 31 deletions(-)

diff --git a/code/org.gluu.agama.smtp.main.json b/code/org.gluu.agama.smtp.main.json
index fb971d6..0119c25 100644
--- a/code/org.gluu.agama.smtp.main.json
+++ b/code/org.gluu.agama.smtp.main.json
@@ -1,5 +1,459 @@
 {
 	"nodes": [
+		{
+			"width": 170,
+			"height": 124,
+			"id": "finish-30d729b4-85f9-4e8b-ba5b-6857d2bbcad6",
+			"position": {
+				"x": 3582,
+				"y": 1184
+			},
+			"type": "finish",
+			"data": {
+				"id": "finish-30d729b4-85f9-4e8b-ba5b-6857d2bbcad6",
+				"type": "Agama-finish-Flow",
+				"parentId": "Agama-assignment-Node-0f34f76c-13bc-42f0-9c27-a56623c8311b",
+				"whenCondition": "",
+				"inRepeatBlock": true,
+				"handles": [],
+				"position": {
+					"x": 3582,
+					"y": 1184
+				},
+				"agamaData": {
+					"id": "finish-30d729b4-85f9-4e8b-ba5b-6857d2bbcad6",
+					"parentId": "Agama-assignment-Node-0f34f76c-13bc-42f0-9c27-a56623c8311b",
+					"type": "Agama-finish-Flow",
+					"hasSuccess": false,
+					"hasFailure": false,
+					"hasComment": true,
+					"comment": "Finish the flow successfully",
+					"flowfilename": "",
+					"returnVariable": "{ userId: uid, uid: uid}",
+					"finishMode": "withSuccess",
+					"nodeIcon": "material-symbols:line-end-square-rounded"
+				}
+			},
+			"selected": true,
+			"dragging": false,
+			"positionAbsolute": {
+				"x": 3582,
+				"y": 1184
+			}
+		},
+		{
+			"width": 170,
+			"height": 124,
+			"id": "Agama-assignment-Node-0f34f76c-13bc-42f0-9c27-a56623c8311b",
+			"position": {
+				"x": 3382,
+				"y": 1184
+			},
+			"type": "assignment",
+			"data": {
+				"id": "Agama-assignment-Node-0f34f76c-13bc-42f0-9c27-a56623c8311b",
+				"type": "Agama-assignment-Node",
+				"parentId": "Agama-when-Node-29e59bc2-ad1f-4b29-8560-936d8f988c5e",
+				"whenCondition": "WhenTrue",
+				"inRepeatBlock": true,
+				"position": {
+					"x": 3382,
+					"y": 1184
+				},
+				"agamaData": {
+					"id": "Agama-assignment-Node-0f34f76c-13bc-42f0-9c27-a56623c8311b",
+					"parentId": "Agama-when-Node-29e59bc2-ad1f-4b29-8560-936d8f988c5e",
+					"type": "Agama-assignment-Node",
+					"displayName": "",
+					"hasComment": true,
+					"comment": "Assign User Id (email) to a variable",
+					"whenCondition": "WhenTrue",
+					"inRepeatBlock": true,
+					"assignments": [
+						{
+							"variableTypeCheck": false,
+							"assignmentExpression": "userData.uid",
+							"assignedVariableName": "uid"
+						}
+					],
+					"nodeIcon": "material-symbols:equal"
+				}
+			},
+			"selected": false,
+			"dragging": false,
+			"positionAbsolute": {
+				"x": 3382,
+				"y": 1184
+			}
+		},
+		{
+			"width": 210,
+			"height": 140,
+			"id": "Agama-when-Node-29e59bc2-ad1f-4b29-8560-936d8f988c5e",
+			"position": {
+				"x": 3269,
+				"y": 954
+			},
+			"parentId": "Agama-rrf-Node-aadc9d35-7833-4185-925e-f554f197702f",
+			"type": "when",
+			"data": {
+				"id": "Agama-when-Node-29e59bc2-ad1f-4b29-8560-936d8f988c5e",
+				"type": "Agama-when-Node",
+				"parentId": "Agama-rrf-Node-aadc9d35-7833-4185-925e-f554f197702f",
+				"whenCondition": "",
+				"inRepeatBlock": true,
+				"position": {
+					"x": 3269,
+					"y": 954
+				},
+				"agamaData": {
+					"id": "Agama-when-Node-29e59bc2-ad1f-4b29-8560-936d8f988c5e",
+					"parentId": "Agama-rrf-Node-aadc9d35-7833-4185-925e-f554f197702f",
+					"type": "Agama-when-Node",
+					"conditions": [
+						{
+							"variable": "acknowledgementInput.ack",
+							"operator": "is",
+							"dataValue": "\"continue\"",
+							"combinator": "none"
+						}
+					],
+					"comment": "User clicks in continue button",
+					"hasComment": true,
+					"inRepeatBlock": true,
+					"hasSuccess": true
+				},
+				"handles": [
+					"Agama-when-Node-29e59bc2-ad1f-4b29-8560-936d8f988c5e.FAILURE",
+					"Agama-when-Node-29e59bc2-ad1f-4b29-8560-936d8f988c5e.SUCCESS"
+				]
+			},
+			"selected": false,
+			"dragging": false,
+			"positionAbsolute": {
+				"x": 3269,
+				"y": 954
+			}
+		},
+		{
+			"width": 170,
+			"height": 124,
+			"id": "Agama-rrf-Node-aadc9d35-7833-4185-925e-f554f197702f",
+			"position": {
+				"x": 3069,
+				"y": 954
+			},
+			"type": "rrf",
+			"data": {
+				"id": "Agama-rrf-Node-aadc9d35-7833-4185-925e-f554f197702f",
+				"type": "Agama-rrf-Node",
+				"parentId": "Agama-assignment-Node-f97de528-05c4-4806-98c4-42cb96941560",
+				"whenCondition": "",
+				"inRepeatBlock": true,
+				"position": {
+					"x": 3069,
+					"y": 954
+				},
+				"agamaData": {
+					"id": "Agama-rrf-Node-aadc9d35-7833-4185-925e-f554f197702f",
+					"parentId": "Agama-assignment-Node-f97de528-05c4-4806-98c4-42cb96941560",
+					"type": "Agama-rrf-Node",
+					"displayName": "",
+					"hasComment": true,
+					"comment": "Show acknowledgement UI page for successful registration",
+					"whenCondition": "",
+					"inRepeatBlock": true,
+					"assignments": [],
+					"nodeIcon": "ph:globe-simple",
+					"templatePath": "acknowledgement.ftlh",
+					"asssignedVariableName": "acknowledgementInput",
+					"arguments": "userData"
+				}
+			},
+			"selected": false,
+			"dragging": false,
+			"positionAbsolute": {
+				"x": 3069,
+				"y": 954
+			}
+		},
+		{
+			"width": 170,
+			"height": 124,
+			"id": "Agama-assignment-Node-f97de528-05c4-4806-98c4-42cb96941560",
+			"position": {
+				"x": 2869,
+				"y": 954
+			},
+			"type": "assignment",
+			"data": {
+				"id": "Agama-assignment-Node-f97de528-05c4-4806-98c4-42cb96941560",
+				"type": "Agama-assignment-Node",
+				"parentId": "Agama-when-Node-a1cab9e9-071f-4aab-84a4-583fc115ddde",
+				"whenCondition": "WhenTrue",
+				"inRepeatBlock": true,
+				"position": {
+					"x": 2869,
+					"y": 954
+				},
+				"agamaData": {
+					"id": "Agama-assignment-Node-f97de528-05c4-4806-98c4-42cb96941560",
+					"parentId": "Agama-when-Node-a1cab9e9-071f-4aab-84a4-583fc115ddde",
+					"type": "Agama-assignment-Node",
+					"displayName": "",
+					"hasComment": true,
+					"comment": "Assign registered user data to a object attributes",
+					"whenCondition": "WhenTrue",
+					"inRepeatBlock": true,
+					"assignments": [
+						{
+							"variableTypeCheck": false,
+							"assignmentExpression": "registrationResult.data",
+							"assignedVariableName": "userData"
+						},
+						{
+							"variableTypeCheck": false,
+							"assignmentExpression": "email",
+							"assignedVariableName": "userData.email"
+						}
+					],
+					"nodeIcon": "material-symbols:equal"
+				}
+			},
+			"selected": false,
+			"positionAbsolute": {
+				"x": 2869,
+				"y": 954
+			},
+			"dragging": false
+		},
+		{
+			"width": 210,
+			"height": 140,
+			"id": "Agama-when-Node-a1cab9e9-071f-4aab-84a4-583fc115ddde",
+			"position": {
+				"x": 2757,
+				"y": 724
+			},
+			"parentId": "Agama-trigger-Node-39fa2313-3459-45b2-8813-53072ef74f21",
+			"type": "when",
+			"data": {
+				"id": "Agama-when-Node-a1cab9e9-071f-4aab-84a4-583fc115ddde",
+				"type": "Agama-when-Node",
+				"parentId": "Agama-trigger-Node-39fa2313-3459-45b2-8813-53072ef74f21",
+				"whenCondition": "",
+				"inRepeatBlock": true,
+				"position": {
+					"x": 2757,
+					"y": 724
+				},
+				"agamaData": {
+					"id": "Agama-when-Node-a1cab9e9-071f-4aab-84a4-583fc115ddde",
+					"parentId": "Agama-trigger-Node-39fa2313-3459-45b2-8813-53072ef74f21",
+					"type": "Agama-when-Node",
+					"conditions": [
+						{
+							"variable": "registrationResult.success",
+							"operator": "is",
+							"dataValue": "true",
+							"combinator": "none"
+						}
+					],
+					"comment": "When user registration is successful",
+					"hasComment": true,
+					"inRepeatBlock": true,
+					"hasSuccess": true
+				},
+				"handles": [
+					"Agama-when-Node-a1cab9e9-071f-4aab-84a4-583fc115ddde.FAILURE",
+					"Agama-when-Node-a1cab9e9-071f-4aab-84a4-583fc115ddde.SUCCESS"
+				]
+			},
+			"selected": false,
+			"dragging": false,
+			"positionAbsolute": {
+				"x": 2757,
+				"y": 724
+			}
+		},
+		{
+			"width": 170,
+			"height": 124,
+			"id": "Agama-trigger-Node-39fa2313-3459-45b2-8813-53072ef74f21",
+			"position": {
+				"x": 2557,
+				"y": 724
+			},
+			"type": "trigger",
+			"data": {
+				"id": "Agama-trigger-Node-39fa2313-3459-45b2-8813-53072ef74f21",
+				"type": "Agama-trigger-Node",
+				"parentId": "Agama-assignment-Node-870ee47e-3cf7-4819-a16e-e3a113a51bd0",
+				"whenCondition": "",
+				"inRepeatBlock": true,
+				"position": {
+					"x": 2557,
+					"y": 724
+				},
+				"agamaData": {
+					"id": "Agama-trigger-Node-39fa2313-3459-45b2-8813-53072ef74f21",
+					"parentId": "Agama-assignment-Node-870ee47e-3cf7-4819-a16e-e3a113a51bd0",
+					"type": "Agama-trigger-Node",
+					"displayName": "",
+					"hasComment": true,
+					"comment": "Run sub-routine to register user with email input",
+					"whenCondition": "",
+					"inRepeatBlock": true,
+					"nodeIcon": "fluent-mdl2:trigger-approval",
+					"flowFileName": "org.gluu.agama.smtp.registration",
+					"arguments": [
+						"emailObj"
+					],
+					"asssignedVariableName": "registrationResult",
+					"exceptionVariableField": ""
+				}
+			},
+			"selected": false,
+			"dragging": false,
+			"positionAbsolute": {
+				"x": 2557,
+				"y": 724
+			}
+		},
+		{
+			"width": 170,
+			"height": 124,
+			"id": "Agama-assignment-Node-870ee47e-3cf7-4819-a16e-e3a113a51bd0",
+			"position": {
+				"x": 2357,
+				"y": 724
+			},
+			"type": "assignment",
+			"data": {
+				"id": "Agama-assignment-Node-870ee47e-3cf7-4819-a16e-e3a113a51bd0",
+				"type": "Agama-assignment-Node",
+				"parentId": "Agama-log-Node-e00859c2-0226-4b4c-b323-16d796b41877",
+				"whenCondition": "",
+				"inRepeatBlock": true,
+				"position": {
+					"x": 2357,
+					"y": 724
+				},
+				"agamaData": {
+					"id": "Agama-assignment-Node-870ee47e-3cf7-4819-a16e-e3a113a51bd0",
+					"parentId": "Agama-log-Node-e00859c2-0226-4b4c-b323-16d796b41877",
+					"type": "Agama-assignment-Node",
+					"displayName": "",
+					"hasComment": true,
+					"comment": "Create object to register user with email input",
+					"whenCondition": "",
+					"inRepeatBlock": true,
+					"assignments": [
+						{
+							"variableTypeCheck": false,
+							"assignmentExpression": "{ email: email }",
+							"assignedVariableName": "emailObj"
+						}
+					],
+					"nodeIcon": "material-symbols:equal"
+				}
+			},
+			"selected": false,
+			"dragging": false,
+			"positionAbsolute": {
+				"x": 2357,
+				"y": 724
+			}
+		},
+		{
+			"width": 170,
+			"height": 124,
+			"id": "Agama-log-Node-e00859c2-0226-4b4c-b323-16d796b41877",
+			"position": {
+				"x": 2157,
+				"y": 724
+			},
+			"type": "log",
+			"data": {
+				"id": "Agama-log-Node-e00859c2-0226-4b4c-b323-16d796b41877",
+				"type": "Agama-log-Node",
+				"parentId": "Agama-when-Node-c5f132f7-5e11-4e7c-8606-956466325662",
+				"whenCondition": "WhenTrue",
+				"inRepeatBlock": true,
+				"position": {
+					"x": 2157,
+					"y": 724
+				},
+				"agamaData": {
+					"id": "Agama-log-Node-e00859c2-0226-4b4c-b323-16d796b41877",
+					"parentId": "Agama-when-Node-c5f132f7-5e11-4e7c-8606-956466325662",
+					"type": "Agama-log-Node",
+					"displayName": "",
+					"hasComment": true,
+					"comment": "E-mail verification passed, initiating user provisioning flow",
+					"whenCondition": "WhenTrue",
+					"inRepeatBlock": true,
+					"logMessage": "\"E-mail verification passed, initiating user provisioning flow\"",
+					"logLevel": "info",
+					"nodeIcon": "octicon:log-16"
+				}
+			},
+			"selected": false,
+			"dragging": false,
+			"positionAbsolute": {
+				"x": 2157,
+				"y": 724
+			}
+		},
+		{
+			"width": 210,
+			"height": 140,
+			"id": "Agama-when-Node-c5f132f7-5e11-4e7c-8606-956466325662",
+			"position": {
+				"x": 2044,
+				"y": 494
+			},
+			"parentId": "Agama-assignment-Node-69595972-81e8-44bd-a12e-841bc5f0dafc",
+			"type": "when",
+			"data": {
+				"id": "Agama-when-Node-c5f132f7-5e11-4e7c-8606-956466325662",
+				"type": "Agama-when-Node",
+				"parentId": "Agama-assignment-Node-69595972-81e8-44bd-a12e-841bc5f0dafc",
+				"whenCondition": "",
+				"inRepeatBlock": true,
+				"position": {
+					"x": 2044,
+					"y": 494
+				},
+				"agamaData": {
+					"id": "Agama-when-Node-c5f132f7-5e11-4e7c-8606-956466325662",
+					"parentId": "Agama-assignment-Node-69595972-81e8-44bd-a12e-841bc5f0dafc",
+					"type": "Agama-when-Node",
+					"conditions": [
+						{
+							"variable": "emailVerificationResult.success",
+							"operator": "is",
+							"dataValue": "true",
+							"combinator": "none"
+						}
+					],
+					"comment": "If email data is valid",
+					"hasComment": true,
+					"inRepeatBlock": true,
+					"hasSuccess": true
+				},
+				"handles": [
+					"Agama-when-Node-c5f132f7-5e11-4e7c-8606-956466325662.FAILURE",
+					"Agama-when-Node-c5f132f7-5e11-4e7c-8606-956466325662.SUCCESS"
+				]
+			},
+			"selected": false,
+			"dragging": false,
+			"positionAbsolute": {
+				"x": 2044,
+				"y": 494
+			}
+		},
 		{
 			"width": 170,
 			"height": 124,
@@ -36,9 +490,10 @@
 						}
 					],
 					"nodeIcon": "material-symbols:equal"
-				}
+				},
+				"skake": false
 			},
-			"selected": true,
+			"selected": false,
 			"dragging": false,
 			"positionAbsolute": {
 				"x": 1844,
@@ -78,7 +533,8 @@
 					"arguments": "email false userData.context",
 					"asssignedVariableName": "emailVerificationResult",
 					"exceptionVariableField": ""
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
@@ -126,7 +582,8 @@
 				"handles": [
 					"Agama-when-Node-2493baf6-a7d6-4f7f-ada5-017db9da4f81.FAILURE",
 					"Agama-when-Node-2493baf6-a7d6-4f7f-ada5-017db9da4f81.SUCCESS"
-				]
+				],
+				"skake": false
 			},
 			"positionAbsolute": {
 				"x": 1531,
@@ -176,7 +633,8 @@
 						}
 					],
 					"nodeIcon": "material-symbols:equal"
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
@@ -221,7 +679,8 @@
 					"arguments": "email",
 					"nodeIcon": "material-symbols:code",
 					"asssignedVariableName": "userData"
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
@@ -266,7 +725,8 @@
 					"arguments": "",
 					"nodeIcon": "material-symbols:code",
 					"asssignedVariableName": "emailService"
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
@@ -311,7 +771,8 @@
 						}
 					],
 					"nodeIcon": "material-symbols:equal"
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
@@ -353,7 +814,8 @@
 					"templatePath": "main.ftlh",
 					"asssignedVariableName": "uiInput",
 					"arguments": "emailObj"
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
@@ -394,7 +856,8 @@
 					"maxIterationVariableName": "max",
 					"comment": "Iterate x times max",
 					"hasComment": true
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
@@ -434,8 +897,8 @@
 			"height": 42,
 			"id": "Agama-note-f4af61a8-27c5-4569-b47c-ba193d77fc2c",
 			"position": {
-				"x": 2430.8354485195,
-				"y": 807.9291153335856
+				"x": 2733.8354485195,
+				"y": 874.9291153335855
 			},
 			"type": "notes",
 			"data": {
@@ -443,15 +906,15 @@
 				"type": "Agama-note",
 				"notes": "New User registration is successful.",
 				"position": {
-					"x": 2430.8354485195,
-					"y": 807.9291153335856
+					"x": 2733.8354485195,
+					"y": 874.9291153335855
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 2430.8354485195,
-				"y": 807.9291153335856
+				"x": 2733.8354485195,
+				"y": 874.9291153335855
 			},
 			"dragging": false
 		},
@@ -460,8 +923,8 @@
 			"height": 55,
 			"id": "Agama-note-9000bb4c-512e-4530-ad7e-ea1aa13ddd66",
 			"position": {
-				"x": 2078.1850535354097,
-				"y": 508.11884467935954
+				"x": 2341.1850535354097,
+				"y": 628.1188446793594
 			},
 			"type": "notes",
 			"data": {
@@ -469,15 +932,15 @@
 				"type": "Agama-note",
 				"notes": "Email OTP verification is successful. Call sub-routine to register new user. ",
 				"position": {
-					"x": 2078.1850535354097,
-					"y": 508.11884467935954
+					"x": 2341.1850535354097,
+					"y": 628.1188446793594
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 2078.1850535354097,
-				"y": 508.11884467935954
+				"x": 2341.1850535354097,
+				"y": 628.1188446793594
 			},
 			"dragging": false
 		},
@@ -512,8 +975,8 @@
 			"height": 81,
 			"id": "Agama-note-24df480b-c97a-4611-b4ce-d54d068c13d3",
 			"position": {
-				"x": 1302,
-				"y": 517
+				"x": 1752.9999999999998,
+				"y": 356.0000000000001
 			},
 			"type": "notes",
 			"data": {
@@ -521,15 +984,15 @@
 				"type": "Agama-note",
 				"notes": "Call sub-routine which sends OTP to the email address and allows user to enter the same OTP on UI. If OTP matches the email verification is successful.",
 				"position": {
-					"x": 1302,
-					"y": 517
+					"x": 1752.9999999999998,
+					"y": 356.0000000000001
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 1302,
-				"y": 517
+				"x": 1752.9999999999998,
+				"y": 356.0000000000001
 			},
 			"dragging": false
 		},
@@ -1002,11 +1465,184 @@
 				"color": "#fff",
 				"fillOpacity": 0.7
 			}
+		},
+		{
+			"id": "Agama-assignment-Node-69595972-81e8-44bd-a12e-841bc5f0dafc-Agama-when-Node-c5f132f7-5e11-4e7c-8606-956466325662-80b970e8-710f-494f-8efe-56f1d0c509a4",
+			"type": "straight",
+			"source": "Agama-assignment-Node-69595972-81e8-44bd-a12e-841bc5f0dafc",
+			"target": "Agama-when-Node-c5f132f7-5e11-4e7c-8606-956466325662",
+			"label": "",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			}
+		},
+		{
+			"id": "Agama-when-Node-c5f132f7-5e11-4e7c-8606-956466325662-Agama-log-Node-e00859c2-0226-4b4c-b323-16d796b41877-2d28564e-2097-4ea1-aaaf-72096d5ae941",
+			"type": "straight",
+			"source": "Agama-when-Node-c5f132f7-5e11-4e7c-8606-956466325662",
+			"target": "Agama-log-Node-e00859c2-0226-4b4c-b323-16d796b41877",
+			"label": "Condition met",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			},
+			"sourceHandle": "Agama-when-Node-c5f132f7-5e11-4e7c-8606-956466325662.SUCCESS"
+		},
+		{
+			"id": "Agama-log-Node-e00859c2-0226-4b4c-b323-16d796b41877-Agama-assignment-Node-870ee47e-3cf7-4819-a16e-e3a113a51bd0-561328fd-3b64-4f2c-a840-0f8a779da191",
+			"type": "straight",
+			"source": "Agama-log-Node-e00859c2-0226-4b4c-b323-16d796b41877",
+			"target": "Agama-assignment-Node-870ee47e-3cf7-4819-a16e-e3a113a51bd0",
+			"label": "",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			}
+		},
+		{
+			"id": "Agama-assignment-Node-870ee47e-3cf7-4819-a16e-e3a113a51bd0-Agama-trigger-Node-39fa2313-3459-45b2-8813-53072ef74f21-cae12888-5f29-4e32-b401-f736a29f1c21",
+			"type": "straight",
+			"source": "Agama-assignment-Node-870ee47e-3cf7-4819-a16e-e3a113a51bd0",
+			"target": "Agama-trigger-Node-39fa2313-3459-45b2-8813-53072ef74f21",
+			"label": "",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			}
+		},
+		{
+			"id": "Agama-trigger-Node-39fa2313-3459-45b2-8813-53072ef74f21-Agama-when-Node-a1cab9e9-071f-4aab-84a4-583fc115ddde-75ab7ce2-bff1-4d93-9c8f-7e38bbbf7537",
+			"type": "straight",
+			"source": "Agama-trigger-Node-39fa2313-3459-45b2-8813-53072ef74f21",
+			"target": "Agama-when-Node-a1cab9e9-071f-4aab-84a4-583fc115ddde",
+			"label": "",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			}
+		},
+		{
+			"id": "Agama-when-Node-a1cab9e9-071f-4aab-84a4-583fc115ddde-Agama-assignment-Node-f97de528-05c4-4806-98c4-42cb96941560-b94913e9-2af6-4a40-89a3-7ae1a30bcad0",
+			"type": "straight",
+			"source": "Agama-when-Node-a1cab9e9-071f-4aab-84a4-583fc115ddde",
+			"target": "Agama-assignment-Node-f97de528-05c4-4806-98c4-42cb96941560",
+			"label": "Condition met",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			},
+			"sourceHandle": "Agama-when-Node-a1cab9e9-071f-4aab-84a4-583fc115ddde.SUCCESS"
+		},
+		{
+			"id": "Agama-assignment-Node-f97de528-05c4-4806-98c4-42cb96941560-Agama-rrf-Node-aadc9d35-7833-4185-925e-f554f197702f-be735d39-06d2-4b23-82ed-3d3b25fd1d74",
+			"type": "straight",
+			"source": "Agama-assignment-Node-f97de528-05c4-4806-98c4-42cb96941560",
+			"target": "Agama-rrf-Node-aadc9d35-7833-4185-925e-f554f197702f",
+			"label": "",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			}
+		},
+		{
+			"id": "Agama-rrf-Node-aadc9d35-7833-4185-925e-f554f197702f-Agama-when-Node-29e59bc2-ad1f-4b29-8560-936d8f988c5e-f0b4fc72-6164-4169-9190-20d390f14ed5",
+			"type": "straight",
+			"source": "Agama-rrf-Node-aadc9d35-7833-4185-925e-f554f197702f",
+			"target": "Agama-when-Node-29e59bc2-ad1f-4b29-8560-936d8f988c5e",
+			"label": "",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			}
+		},
+		{
+			"id": "Agama-when-Node-29e59bc2-ad1f-4b29-8560-936d8f988c5e-Agama-assignment-Node-0f34f76c-13bc-42f0-9c27-a56623c8311b-6b0d65d8-6886-4745-82fc-b9b7cecbf72d",
+			"type": "straight",
+			"source": "Agama-when-Node-29e59bc2-ad1f-4b29-8560-936d8f988c5e",
+			"target": "Agama-assignment-Node-0f34f76c-13bc-42f0-9c27-a56623c8311b",
+			"label": "Condition met",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			},
+			"sourceHandle": "Agama-when-Node-29e59bc2-ad1f-4b29-8560-936d8f988c5e.SUCCESS"
+		},
+		{
+			"id": "Agama-assignment-Node-0f34f76c-13bc-42f0-9c27-a56623c8311b-finish-30d729b4-85f9-4e8b-ba5b-6857d2bbcad6-106e0d4f-a8bf-4f64-8c32-c849a13a43c6",
+			"type": "straight",
+			"source": "Agama-assignment-Node-0f34f76c-13bc-42f0-9c27-a56623c8311b",
+			"target": "finish-30d729b4-85f9-4e8b-ba5b-6857d2bbcad6",
+			"label": "",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			}
 		}
 	],
 	"viewport": {
-		"x": -863.8671547705076,
-		"y": 33.63525438757414,
-		"zoom": 1.0000000000000007
+		"x": -2699.8671547705085,
+		"y": -704.3647456124258,
+		"zoom": 1.0000000000000009
 	}
 }
\ No newline at end of file

From 96ac2cdaa3281c5ee64bbc1dcbdcec139aed112c Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 12:39:18 +0530
Subject: [PATCH 18/32] feat: update org.gluu.agama.smtp.main.flow

---
 code/org.gluu.agama.smtp.main.flow | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/code/org.gluu.agama.smtp.main.flow b/code/org.gluu.agama.smtp.main.flow
index b7f0af4..359dd17 100644
--- a/code/org.gluu.agama.smtp.main.flow
+++ b/code/org.gluu.agama.smtp.main.flow
@@ -23,4 +23,26 @@ max = Repeat 3 times max
           // Trigger sub-routine to verify email
           emailVerificationResult = Trigger org.gluu.agama.smtp.emailVerification email false userData.context
           // Reset error message to empty after email verification
-          emailObj.errorMessage = ""
\ No newline at end of file
+          emailObj.errorMessage = ""
+          // If email data is valid
+          When emailVerificationResult.success is true
+               // E-mail verification passed, initiating user provisioning flow
+               Log "@info E-mail verification passed, initiating user provisioning flow"
+               // Create object to register user with email input
+               emailObj = { email: email }
+               // Run sub-routine to register user with email input
+               registrationResult = Trigger org.gluu.agama.smtp.registration emailObj
+               // When user registration is successful
+               When registrationResult.success is true
+                    // Assign registered user data to a object attributes
+                    userData = registrationResult.data
+                    userData.email = email
+                    // Show acknowledgement UI page for successful registration
+                    acknowledgementInput = RRF "acknowledgement.ftlh" userData
+                    // User clicks in continue button
+                    When acknowledgementInput.ack is "continue"
+                         // Assign User Id (email) to a variable
+                         uid = userData.uid
+                         // Finish the flow successfully
+                         it_zwwlp = {success:true, data: { userId: uid, uid: uid}}
+                         Finish it_zwwlp
\ No newline at end of file

From c9146ee4ce737a9e879c6bf3e6dcbe98be4d28fb Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 13:00:47 +0530
Subject: [PATCH 19/32] feat: update project.json


From 4c5b30c891ba0215d9fc2d39093ecf208ac863fe Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 13:00:50 +0530
Subject: [PATCH 20/32] feat: update org.gluu.agama.smtp.main.json

---
 code/org.gluu.agama.smtp.main.json | 813 ++++++++++++++++++++++++++---
 1 file changed, 753 insertions(+), 60 deletions(-)

diff --git a/code/org.gluu.agama.smtp.main.json b/code/org.gluu.agama.smtp.main.json
index 0119c25..fb2d507 100644
--- a/code/org.gluu.agama.smtp.main.json
+++ b/code/org.gluu.agama.smtp.main.json
@@ -1,5 +1,491 @@
 {
 	"nodes": [
+		{
+			"width": 170,
+			"height": 124,
+			"id": "finish-0ba80e8c-7038-4bfa-9741-a32f7072f544",
+			"position": {
+				"x": 1032.9999999999998,
+				"y": -163.99999999999983
+			},
+			"type": "finish",
+			"data": {
+				"id": "finish-0ba80e8c-7038-4bfa-9741-a32f7072f544",
+				"type": "Agama-finish-Flow",
+				"parentId": "Agama-log-Node-7a6a1b92-ce0a-4bb2-8dac-abeeb608ca8a",
+				"whenCondition": "",
+				"inRepeatBlock": false,
+				"handles": [],
+				"position": {
+					"x": 1032.9999999999998,
+					"y": -163.99999999999983
+				},
+				"agamaData": {
+					"id": "finish-0ba80e8c-7038-4bfa-9741-a32f7072f544",
+					"parentId": "Agama-log-Node-7a6a1b92-ce0a-4bb2-8dac-abeeb608ca8a",
+					"type": "Agama-finish-Flow",
+					"hasSuccess": false,
+					"hasFailure": false,
+					"hasComment": true,
+					"comment": "Credential enrollment or authenticator flow failed",
+					"flowfilename": "",
+					"returnVariable": "Credential enrollment or authenticator flow failed",
+					"finishMode": "withFailure",
+					"nodeIcon": "material-symbols:line-end-square-rounded"
+				}
+			},
+			"selected": false,
+			"dragging": false,
+			"positionAbsolute": {
+				"x": 1032.9999999999998,
+				"y": -163.99999999999983
+			}
+		},
+		{
+			"width": 170,
+			"height": 124,
+			"id": "Agama-log-Node-7a6a1b92-ce0a-4bb2-8dac-abeeb608ca8a",
+			"position": {
+				"x": 761.9999999999998,
+				"y": -162.99999999999966
+			},
+			"type": "log",
+			"data": {
+				"id": "Agama-log-Node-7a6a1b92-ce0a-4bb2-8dac-abeeb608ca8a",
+				"type": "Agama-log-Node",
+				"parentId": "Agama-repeat-Node-34862b8f-6f01-41d7-b101-138a1142008c",
+				"whenCondition": "",
+				"inRepeatBlock": false,
+				"position": {
+					"x": 761.9999999999998,
+					"y": -162.99999999999966
+				},
+				"agamaData": {
+					"id": "Agama-log-Node-7a6a1b92-ce0a-4bb2-8dac-abeeb608ca8a",
+					"parentId": "Agama-repeat-Node-34862b8f-6f01-41d7-b101-138a1142008c",
+					"type": "Agama-log-Node",
+					"displayName": "",
+					"hasComment": true,
+					"comment": "Fail if credential enrollment or authenticator flow failed",
+					"whenCondition": "",
+					"inRepeatBlock": false,
+					"logMessage": "\"Fail if credential enrollment or authenticator flow failed\"",
+					"logLevel": "info",
+					"nodeIcon": "octicon:log-16"
+				}
+			},
+			"selected": false,
+			"dragging": false,
+			"positionAbsolute": {
+				"x": 761.9999999999998,
+				"y": -162.99999999999966
+			}
+		},
+		{
+			"width": 170,
+			"height": 124,
+			"id": "Agama-assignment-Node-20656515-8514-471a-bfb5-1532ebcb1a8e",
+			"position": {
+				"x": 2703,
+				"y": -84.99999999999955
+			},
+			"type": "assignment",
+			"data": {
+				"id": "Agama-assignment-Node-20656515-8514-471a-bfb5-1532ebcb1a8e",
+				"type": "Agama-assignment-Node",
+				"parentId": "Agama-when-Node-f53e8a47-c36c-4487-8bd2-d66837b1b4fc",
+				"whenCondition": "WhenTrue",
+				"inRepeatBlock": true,
+				"position": {
+					"x": 2703,
+					"y": -84.99999999999955
+				},
+				"agamaData": {
+					"id": "Agama-assignment-Node-20656515-8514-471a-bfb5-1532ebcb1a8e",
+					"parentId": "Agama-when-Node-f53e8a47-c36c-4487-8bd2-d66837b1b4fc",
+					"type": "Agama-assignment-Node",
+					"displayName": "",
+					"hasComment": true,
+					"comment": "Assigning error message to a variable",
+					"whenCondition": "WhenTrue",
+					"inRepeatBlock": true,
+					"assignments": [
+						{
+							"variableTypeCheck": true,
+							"assignmentExpression": "Error sending email. Check email address and SMTP configuration.",
+							"assignedVariableName": "emailObj.errorMessage"
+						}
+					],
+					"nodeIcon": "material-symbols:equal"
+				}
+			},
+			"selected": false,
+			"positionAbsolute": {
+				"x": 2703,
+				"y": -84.99999999999955
+			},
+			"dragging": false
+		},
+		{
+			"width": 210,
+			"height": 140,
+			"id": "Agama-when-Node-f53e8a47-c36c-4487-8bd2-d66837b1b4fc",
+			"position": {
+				"x": 2413,
+				"y": -163.99999999999966
+			},
+			"parentId": "Agama-when-Node-e619ca76-95bb-4baf-99b0-539e9b8ae623",
+			"type": "when",
+			"data": {
+				"id": "Agama-when-Node-f53e8a47-c36c-4487-8bd2-d66837b1b4fc",
+				"type": "Agama-when-Node",
+				"parentId": "Agama-when-Node-e619ca76-95bb-4baf-99b0-539e9b8ae623",
+				"whenCondition": "WhenFalse",
+				"inRepeatBlock": true,
+				"position": {
+					"x": 2413,
+					"y": -163.99999999999966
+				},
+				"agamaData": {
+					"id": "Agama-when-Node-f53e8a47-c36c-4487-8bd2-d66837b1b4fc",
+					"parentId": "Agama-when-Node-e619ca76-95bb-4baf-99b0-539e9b8ae623",
+					"type": "Agama-when-Node",
+					"conditions": [
+						{
+							"variable": "emailVerificationResult.success",
+							"operator": "is",
+							"dataValue": "false",
+							"combinator": "none"
+						}
+					],
+					"hasComment": true,
+					"inRepeatBlock": true,
+					"hasSuccess": true
+				},
+				"handles": [
+					"Agama-when-Node-f53e8a47-c36c-4487-8bd2-d66837b1b4fc.FAILURE",
+					"Agama-when-Node-f53e8a47-c36c-4487-8bd2-d66837b1b4fc.SUCCESS"
+				]
+			},
+			"selected": false,
+			"dragging": false,
+			"positionAbsolute": {
+				"x": 2413,
+				"y": -163.99999999999966
+			}
+		},
+		{
+			"width": 170,
+			"height": 124,
+			"id": "finish-e77aeb14-5cb8-46d7-8942-a173da83c957",
+			"position": {
+				"x": 2479,
+				"y": -5.999999999999602
+			},
+			"type": "finish",
+			"data": {
+				"id": "finish-e77aeb14-5cb8-46d7-8942-a173da83c957",
+				"type": "Agama-finish-Flow",
+				"parentId": "Agama-assignment-Node-fc5e0c63-076c-4538-b3f5-861e46740aaa",
+				"whenCondition": "",
+				"inRepeatBlock": true,
+				"handles": [],
+				"position": {
+					"x": 2479,
+					"y": -5.999999999999602
+				},
+				"agamaData": {
+					"id": "finish-e77aeb14-5cb8-46d7-8942-a173da83c957",
+					"parentId": "Agama-assignment-Node-fc5e0c63-076c-4538-b3f5-861e46740aaa",
+					"type": "Agama-finish-Flow",
+					"hasSuccess": false,
+					"hasFailure": false,
+					"hasComment": true,
+					"comment": "Email verification and hence authentication is successful",
+					"flowfilename": "",
+					"returnVariable": "{userId: uid, uid: uid}",
+					"finishMode": "withSuccess",
+					"nodeIcon": "material-symbols:line-end-square-rounded"
+				}
+			},
+			"selected": false,
+			"dragging": false,
+			"positionAbsolute": {
+				"x": 2479,
+				"y": -5.999999999999602
+			}
+		},
+		{
+			"width": 170,
+			"height": 124,
+			"id": "Agama-assignment-Node-fc5e0c63-076c-4538-b3f5-861e46740aaa",
+			"position": {
+				"x": 2279,
+				"y": -5.999999999999602
+			},
+			"type": "assignment",
+			"data": {
+				"id": "Agama-assignment-Node-fc5e0c63-076c-4538-b3f5-861e46740aaa",
+				"type": "Agama-assignment-Node",
+				"parentId": "Agama-when-Node-e619ca76-95bb-4baf-99b0-539e9b8ae623",
+				"whenCondition": "WhenTrue",
+				"inRepeatBlock": true,
+				"position": {
+					"x": 2279,
+					"y": -5.999999999999602
+				},
+				"agamaData": {
+					"id": "Agama-assignment-Node-fc5e0c63-076c-4538-b3f5-861e46740aaa",
+					"parentId": "Agama-when-Node-e619ca76-95bb-4baf-99b0-539e9b8ae623",
+					"type": "Agama-assignment-Node",
+					"displayName": "",
+					"hasComment": true,
+					"comment": "Assigning user id (email) to a variable",
+					"whenCondition": "WhenTrue",
+					"inRepeatBlock": true,
+					"assignments": [
+						{
+							"variableTypeCheck": false,
+							"assignmentExpression": "userData.uid",
+							"assignedVariableName": "uid"
+						}
+					],
+					"nodeIcon": "material-symbols:equal"
+				}
+			},
+			"selected": false,
+			"dragging": false,
+			"positionAbsolute": {
+				"x": 2279,
+				"y": -5.999999999999602
+			}
+		},
+		{
+			"width": 210,
+			"height": 140,
+			"id": "Agama-when-Node-e619ca76-95bb-4baf-99b0-539e9b8ae623",
+			"position": {
+				"x": 2163,
+				"y": -163.99999999999966
+			},
+			"parentId": "Agama-trigger-Node-062116c9-45e8-4b84-b943-d33e3db16bc2",
+			"type": "when",
+			"data": {
+				"id": "Agama-when-Node-e619ca76-95bb-4baf-99b0-539e9b8ae623",
+				"type": "Agama-when-Node",
+				"parentId": "Agama-trigger-Node-062116c9-45e8-4b84-b943-d33e3db16bc2",
+				"whenCondition": "",
+				"inRepeatBlock": true,
+				"position": {
+					"x": 2163,
+					"y": -163.99999999999966
+				},
+				"agamaData": {
+					"id": "Agama-when-Node-e619ca76-95bb-4baf-99b0-539e9b8ae623",
+					"parentId": "Agama-trigger-Node-062116c9-45e8-4b84-b943-d33e3db16bc2",
+					"type": "Agama-when-Node",
+					"conditions": [
+						{
+							"variable": "emailVerificationResult.success",
+							"operator": "is",
+							"dataValue": "true",
+							"combinator": "none"
+						}
+					],
+					"comment": "When email verification is successful",
+					"hasComment": true,
+					"inRepeatBlock": true,
+					"hasSuccess": true,
+					"hasFailure": true
+				},
+				"handles": [
+					"Agama-when-Node-e619ca76-95bb-4baf-99b0-539e9b8ae623.FAILURE",
+					"Agama-when-Node-e619ca76-95bb-4baf-99b0-539e9b8ae623.SUCCESS"
+				]
+			},
+			"selected": false,
+			"dragging": false,
+			"positionAbsolute": {
+				"x": 2163,
+				"y": -163.99999999999966
+			}
+		},
+		{
+			"width": 170,
+			"height": 124,
+			"id": "Agama-trigger-Node-062116c9-45e8-4b84-b943-d33e3db16bc2",
+			"position": {
+				"x": 1963,
+				"y": -163.99999999999966
+			},
+			"type": "trigger",
+			"data": {
+				"id": "Agama-trigger-Node-062116c9-45e8-4b84-b943-d33e3db16bc2",
+				"type": "Agama-trigger-Node",
+				"parentId": "Agama-log-Node-090f24dd-96e0-47dc-af1a-b6081448f3d6",
+				"whenCondition": "",
+				"inRepeatBlock": true,
+				"position": {
+					"x": 1963,
+					"y": -163.99999999999966
+				},
+				"agamaData": {
+					"id": "Agama-trigger-Node-062116c9-45e8-4b84-b943-d33e3db16bc2",
+					"parentId": "Agama-log-Node-090f24dd-96e0-47dc-af1a-b6081448f3d6",
+					"type": "Agama-trigger-Node",
+					"displayName": "",
+					"hasComment": true,
+					"comment": "Run email verification sub-routine",
+					"whenCondition": "",
+					"inRepeatBlock": true,
+					"nodeIcon": "fluent-mdl2:trigger-approval",
+					"flowFileName": "org.gluu.agama.smtp.emailVerification",
+					"arguments": "email true userData.context",
+					"asssignedVariableName": "emailVerificationResult",
+					"exceptionVariableField": ""
+				}
+			},
+			"selected": false,
+			"dragging": false,
+			"positionAbsolute": {
+				"x": 1963,
+				"y": -163.99999999999966
+			}
+		},
+		{
+			"width": 170,
+			"height": 124,
+			"id": "Agama-log-Node-090f24dd-96e0-47dc-af1a-b6081448f3d6",
+			"position": {
+				"x": 1748,
+				"y": -163.99999999999966
+			},
+			"type": "log",
+			"data": {
+				"id": "Agama-log-Node-090f24dd-96e0-47dc-af1a-b6081448f3d6",
+				"type": "Agama-log-Node",
+				"parentId": "Agama-when-Node-2493baf6-a7d6-4f7f-ada5-017db9da4f81",
+				"whenCondition": "WhenFalse",
+				"inRepeatBlock": true,
+				"position": {
+					"x": 1748,
+					"y": -163.99999999999966
+				},
+				"agamaData": {
+					"id": "Agama-log-Node-090f24dd-96e0-47dc-af1a-b6081448f3d6",
+					"parentId": "Agama-when-Node-2493baf6-a7d6-4f7f-ada5-017db9da4f81",
+					"type": "Agama-log-Node",
+					"displayName": "",
+					"hasComment": true,
+					"comment": "User with same email already exists",
+					"whenCondition": "WhenFalse",
+					"inRepeatBlock": true,
+					"logMessage": "\"User with e-mail % is known\" email",
+					"logLevel": "info",
+					"nodeIcon": "octicon:log-16"
+				}
+			},
+			"selected": false,
+			"positionAbsolute": {
+				"x": 1748,
+				"y": -163.99999999999966
+			},
+			"dragging": false
+		},
+		{
+			"width": 170,
+			"height": 124,
+			"id": "Agama-assignment-Node-bf47f92c-efc2-4d45-97a6-e5ca6772c9e2",
+			"position": {
+				"x": 2376,
+				"y": 505.0000000000001
+			},
+			"type": "assignment",
+			"data": {
+				"id": "Agama-assignment-Node-bf47f92c-efc2-4d45-97a6-e5ca6772c9e2",
+				"type": "Agama-assignment-Node",
+				"parentId": "Agama-when-Node-30f1f54c-16e2-4441-9dc6-7098a00bbd5e",
+				"whenCondition": "WhenTrue",
+				"inRepeatBlock": true,
+				"position": {
+					"x": 2376,
+					"y": 505.0000000000001
+				},
+				"agamaData": {
+					"id": "Agama-assignment-Node-bf47f92c-efc2-4d45-97a6-e5ca6772c9e2",
+					"parentId": "Agama-when-Node-30f1f54c-16e2-4441-9dc6-7098a00bbd5e",
+					"type": "Agama-assignment-Node",
+					"displayName": "",
+					"hasComment": true,
+					"comment": "Error variable assignment. ",
+					"whenCondition": "WhenTrue",
+					"inRepeatBlock": true,
+					"assignments": [
+						{
+							"variableTypeCheck": true,
+							"assignmentExpression": "Error sending email. Check email address and SMTP configuration.",
+							"assignedVariableName": "emailObj.errorMessage"
+						}
+					],
+					"nodeIcon": "material-symbols:equal"
+				}
+			},
+			"selected": false,
+			"positionAbsolute": {
+				"x": 2376,
+				"y": 505.0000000000001
+			},
+			"dragging": false
+		},
+		{
+			"width": 210,
+			"height": 140,
+			"id": "Agama-when-Node-30f1f54c-16e2-4441-9dc6-7098a00bbd5e",
+			"position": {
+				"x": 2263,
+				"y": 349.0000000000001
+			},
+			"parentId": "Agama-when-Node-c5f132f7-5e11-4e7c-8606-956466325662",
+			"type": "when",
+			"data": {
+				"id": "Agama-when-Node-30f1f54c-16e2-4441-9dc6-7098a00bbd5e",
+				"type": "Agama-when-Node",
+				"parentId": "Agama-when-Node-c5f132f7-5e11-4e7c-8606-956466325662",
+				"whenCondition": "WhenFalse",
+				"inRepeatBlock": true,
+				"position": {
+					"x": 2263,
+					"y": 349.0000000000001
+				},
+				"agamaData": {
+					"id": "Agama-when-Node-30f1f54c-16e2-4441-9dc6-7098a00bbd5e",
+					"parentId": "Agama-when-Node-c5f132f7-5e11-4e7c-8606-956466325662",
+					"type": "Agama-when-Node",
+					"conditions": [
+						{
+							"variable": "emailVerificationResult.success",
+							"operator": "is",
+							"dataValue": "false",
+							"combinator": "none"
+						}
+					],
+					"comment": "When email verification is invalid",
+					"hasComment": true,
+					"inRepeatBlock": true,
+					"hasSuccess": true
+				},
+				"handles": [
+					"Agama-when-Node-30f1f54c-16e2-4441-9dc6-7098a00bbd5e.FAILURE",
+					"Agama-when-Node-30f1f54c-16e2-4441-9dc6-7098a00bbd5e.SUCCESS"
+				]
+			},
+			"selected": false,
+			"dragging": false,
+			"positionAbsolute": {
+				"x": 2263,
+				"y": 349.0000000000001
+			}
+		},
 		{
 			"width": 170,
 			"height": 124,
@@ -32,9 +518,10 @@
 					"returnVariable": "{ userId: uid, uid: uid}",
 					"finishMode": "withSuccess",
 					"nodeIcon": "material-symbols:line-end-square-rounded"
-				}
+				},
+				"skake": false
 			},
-			"selected": true,
+			"selected": false,
 			"dragging": false,
 			"positionAbsolute": {
 				"x": 3582,
@@ -77,7 +564,8 @@
 						}
 					],
 					"nodeIcon": "material-symbols:equal"
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
@@ -126,7 +614,8 @@
 				"handles": [
 					"Agama-when-Node-29e59bc2-ad1f-4b29-8560-936d8f988c5e.FAILURE",
 					"Agama-when-Node-29e59bc2-ad1f-4b29-8560-936d8f988c5e.SUCCESS"
-				]
+				],
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
@@ -168,7 +657,8 @@
 					"templatePath": "acknowledgement.ftlh",
 					"asssignedVariableName": "acknowledgementInput",
 					"arguments": "userData"
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
@@ -218,7 +708,8 @@
 						}
 					],
 					"nodeIcon": "material-symbols:equal"
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
@@ -267,7 +758,8 @@
 				"handles": [
 					"Agama-when-Node-a1cab9e9-071f-4aab-84a4-583fc115ddde.FAILURE",
 					"Agama-when-Node-a1cab9e9-071f-4aab-84a4-583fc115ddde.SUCCESS"
-				]
+				],
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
@@ -311,7 +803,8 @@
 					],
 					"asssignedVariableName": "registrationResult",
 					"exceptionVariableField": ""
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
@@ -356,7 +849,8 @@
 						}
 					],
 					"nodeIcon": "material-symbols:equal"
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
@@ -396,7 +890,8 @@
 					"logMessage": "\"E-mail verification passed, initiating user provisioning flow\"",
 					"logLevel": "info",
 					"nodeIcon": "octicon:log-16"
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
@@ -440,12 +935,14 @@
 					"comment": "If email data is valid",
 					"hasComment": true,
 					"inRepeatBlock": true,
-					"hasSuccess": true
+					"hasSuccess": true,
+					"hasFailure": true
 				},
 				"handles": [
 					"Agama-when-Node-c5f132f7-5e11-4e7c-8606-956466325662.FAILURE",
 					"Agama-when-Node-c5f132f7-5e11-4e7c-8606-956466325662.SUCCESS"
-				]
+				],
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
@@ -577,7 +1074,8 @@
 					],
 					"hasComment": true,
 					"inRepeatBlock": true,
-					"hasSuccess": true
+					"hasSuccess": true,
+					"hasFailure": true
 				},
 				"handles": [
 					"Agama-when-Node-2493baf6-a7d6-4f7f-ada5-017db9da4f81.FAILURE",
@@ -855,7 +1353,8 @@
 					"maxIteration": "3",
 					"maxIterationVariableName": "max",
 					"comment": "Iterate x times max",
-					"hasComment": true
+					"hasComment": true,
+					"hasNoRepeat": true
 				},
 				"skake": false
 			},
@@ -949,8 +1448,8 @@
 			"height": 55,
 			"id": "Agama-note-4888adb9-94c1-4e6e-9e6e-e8c82902c87a",
 			"position": {
-				"x": 2239.0028232349955,
-				"y": 325.47580623483094
+				"x": 2230.002823234996,
+				"y": 217.475806234831
 			},
 			"type": "notes",
 			"data": {
@@ -958,15 +1457,15 @@
 				"type": "Agama-note",
 				"notes": "Email OTP verification failed. Authentication is unsuccessful. Finish the flow.",
 				"position": {
-					"x": 2239.0028232349955,
-					"y": 325.47580623483094
+					"x": 2230.002823234996,
+					"y": 217.475806234831
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 2239.0028232349955,
-				"y": 325.47580623483094
+				"x": 2230.002823234996,
+				"y": 217.475806234831
 			},
 			"dragging": false
 		},
@@ -975,8 +1474,8 @@
 			"height": 81,
 			"id": "Agama-note-24df480b-c97a-4611-b4ce-d54d068c13d3",
 			"position": {
-				"x": 1752.9999999999998,
-				"y": 356.0000000000001
+				"x": 1808.9999999999993,
+				"y": 342.0000000000001
 			},
 			"type": "notes",
 			"data": {
@@ -984,15 +1483,15 @@
 				"type": "Agama-note",
 				"notes": "Call sub-routine which sends OTP to the email address and allows user to enter the same OTP on UI. If OTP matches the email verification is successful.",
 				"position": {
-					"x": 1752.9999999999998,
-					"y": 356.0000000000001
+					"x": 1808.9999999999993,
+					"y": 342.0000000000001
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 1752.9999999999998,
-				"y": 356.0000000000001
+				"x": 1808.9999999999993,
+				"y": 342.0000000000001
 			},
 			"dragging": false
 		},
@@ -1053,8 +1552,8 @@
 			"height": 81,
 			"id": "Agama-note-05287edd-b2fb-44ab-9a44-84a2b24299a8",
 			"position": {
-				"x": 1815,
-				"y": -322
+				"x": 1789,
+				"y": -298.00000000000006
 			},
 			"type": "notes",
 			"data": {
@@ -1062,15 +1561,15 @@
 				"type": "Agama-note",
 				"notes": "Call sub-routine which sends OTP to the email address and allows user to enter the same OTP on UI. If OTP matches the email verification is successful.",
 				"position": {
-					"x": 1815,
-					"y": -322
+					"x": 1789,
+					"y": -298.00000000000006
 				},
 				"skake": false
 			},
-			"selected": false,
+			"selected": true,
 			"positionAbsolute": {
-				"x": 1815,
-				"y": -322
+				"x": 1789,
+				"y": -298.00000000000006
 			},
 			"dragging": false
 		},
@@ -1079,8 +1578,8 @@
 			"height": 55,
 			"id": "Agama-note-f2206bdf-edfa-4370-9e17-f8a78d1e0bfe",
 			"position": {
-				"x": 1513,
-				"y": -29
+				"x": 1340,
+				"y": 415.99999999999955
 			},
 			"type": "notes",
 			"data": {
@@ -1088,15 +1587,15 @@
 				"type": "Agama-note",
 				"notes": "User with entered email address is not registered on authentication server. ",
 				"position": {
-					"x": 1513,
-					"y": -29
+					"x": 1340,
+					"y": 415.99999999999955
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 1513,
-				"y": -29
+				"x": 1340,
+				"y": 415.99999999999955
 			},
 			"dragging": false
 		},
@@ -1105,8 +1604,8 @@
 			"height": 55,
 			"id": "Agama-note-1b6bff57-8181-415a-a512-57cfa54b9c43",
 			"position": {
-				"x": 1339,
-				"y": 118.00000000000003
+				"x": 1460.9999999999998,
+				"y": 41.00000000000003
 			},
 			"type": "notes",
 			"data": {
@@ -1114,15 +1613,15 @@
 				"type": "Agama-note",
 				"notes": "User with entered email address already registered on authentication server. ",
 				"position": {
-					"x": 1339,
-					"y": 118.00000000000003
+					"x": 1460.9999999999998,
+					"y": 41.00000000000003
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 1339,
-				"y": 118.00000000000003
+				"x": 1460.9999999999998,
+				"y": 41.00000000000003
 			},
 			"dragging": false
 		},
@@ -1131,8 +1630,8 @@
 			"height": 68,
 			"id": "Agama-note-450f1b80-9e04-4e03-b4b2-672fc395aaba",
 			"position": {
-				"x": 1019,
-				"y": 111.99999999999991
+				"x": 1104,
+				"y": 137.99999999999986
 			},
 			"type": "notes",
 			"data": {
@@ -1140,15 +1639,15 @@
 				"type": "Agama-note",
 				"notes": "Email service will will try to fetch user details from authentication server using the entered email address.",
 				"position": {
-					"x": 1019,
-					"y": 111.99999999999991
+					"x": 1104,
+					"y": 137.99999999999986
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 1019,
-				"y": 111.99999999999991
+				"x": 1104,
+				"y": 137.99999999999986
 			},
 			"dragging": false
 		},
@@ -1157,8 +1656,8 @@
 			"height": 42,
 			"id": "Agama-note-9b67b98d-875a-49d7-ad75-a3349c7252ab",
 			"position": {
-				"x": 675,
-				"y": 130.9999999999999
+				"x": 723,
+				"y": 142.9999999999999
 			},
 			"type": "notes",
 			"data": {
@@ -1166,15 +1665,15 @@
 				"type": "Agama-note",
 				"notes": "Retrieving email address entered by user on UI. ",
 				"position": {
-					"x": 675,
-					"y": 130.9999999999999
+					"x": 723,
+					"y": 142.9999999999999
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 675,
-				"y": 130.9999999999999
+				"x": 723,
+				"y": 142.9999999999999
 			},
 			"dragging": false
 		},
@@ -1638,11 +2137,205 @@
 				"color": "#fff",
 				"fillOpacity": 0.7
 			}
+		},
+		{
+			"id": "Agama-when-Node-c5f132f7-5e11-4e7c-8606-956466325662-Agama-when-Node-30f1f54c-16e2-4441-9dc6-7098a00bbd5e-4e00d786-c914-44e9-a5a3-28a56a1caf42",
+			"type": "straight",
+			"source": "Agama-when-Node-c5f132f7-5e11-4e7c-8606-956466325662",
+			"target": "Agama-when-Node-30f1f54c-16e2-4441-9dc6-7098a00bbd5e",
+			"label": "",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			},
+			"sourceHandle": "Agama-when-Node-c5f132f7-5e11-4e7c-8606-956466325662.FAILURE"
+		},
+		{
+			"id": "Agama-when-Node-30f1f54c-16e2-4441-9dc6-7098a00bbd5e-Agama-assignment-Node-bf47f92c-efc2-4d45-97a6-e5ca6772c9e2-4dc622fc-e6f6-4296-abca-ff9d8b9bb63f",
+			"type": "straight",
+			"source": "Agama-when-Node-30f1f54c-16e2-4441-9dc6-7098a00bbd5e",
+			"target": "Agama-assignment-Node-bf47f92c-efc2-4d45-97a6-e5ca6772c9e2",
+			"label": "Condition met",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			},
+			"sourceHandle": "Agama-when-Node-30f1f54c-16e2-4441-9dc6-7098a00bbd5e.SUCCESS"
+		},
+		{
+			"id": "Agama-when-Node-2493baf6-a7d6-4f7f-ada5-017db9da4f81-Agama-log-Node-090f24dd-96e0-47dc-af1a-b6081448f3d6-05e727be-ab72-4adf-813e-036b8a7e6f13",
+			"type": "straight",
+			"source": "Agama-when-Node-2493baf6-a7d6-4f7f-ada5-017db9da4f81",
+			"target": "Agama-log-Node-090f24dd-96e0-47dc-af1a-b6081448f3d6",
+			"label": "",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			},
+			"sourceHandle": "Agama-when-Node-2493baf6-a7d6-4f7f-ada5-017db9da4f81.FAILURE"
+		},
+		{
+			"id": "Agama-log-Node-090f24dd-96e0-47dc-af1a-b6081448f3d6-Agama-trigger-Node-062116c9-45e8-4b84-b943-d33e3db16bc2-21e690a3-9e28-4dbd-a856-c069eae9eff9",
+			"type": "straight",
+			"source": "Agama-log-Node-090f24dd-96e0-47dc-af1a-b6081448f3d6",
+			"target": "Agama-trigger-Node-062116c9-45e8-4b84-b943-d33e3db16bc2",
+			"label": "",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			}
+		},
+		{
+			"id": "Agama-trigger-Node-062116c9-45e8-4b84-b943-d33e3db16bc2-Agama-when-Node-e619ca76-95bb-4baf-99b0-539e9b8ae623-c3b077a6-f1d8-4e71-a422-21c02a4fc0f6",
+			"type": "straight",
+			"source": "Agama-trigger-Node-062116c9-45e8-4b84-b943-d33e3db16bc2",
+			"target": "Agama-when-Node-e619ca76-95bb-4baf-99b0-539e9b8ae623",
+			"label": "",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			}
+		},
+		{
+			"id": "Agama-when-Node-e619ca76-95bb-4baf-99b0-539e9b8ae623-Agama-assignment-Node-fc5e0c63-076c-4538-b3f5-861e46740aaa-044fd9ab-b38e-4a94-86f5-9f361b57dc5e",
+			"type": "straight",
+			"source": "Agama-when-Node-e619ca76-95bb-4baf-99b0-539e9b8ae623",
+			"target": "Agama-assignment-Node-fc5e0c63-076c-4538-b3f5-861e46740aaa",
+			"label": "Condition met",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			},
+			"sourceHandle": "Agama-when-Node-e619ca76-95bb-4baf-99b0-539e9b8ae623.SUCCESS"
+		},
+		{
+			"id": "Agama-assignment-Node-fc5e0c63-076c-4538-b3f5-861e46740aaa-finish-e77aeb14-5cb8-46d7-8942-a173da83c957-73f4565f-da4e-4c10-bde0-c1c47ae16b0b",
+			"type": "straight",
+			"source": "Agama-assignment-Node-fc5e0c63-076c-4538-b3f5-861e46740aaa",
+			"target": "finish-e77aeb14-5cb8-46d7-8942-a173da83c957",
+			"label": "",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			}
+		},
+		{
+			"id": "Agama-when-Node-e619ca76-95bb-4baf-99b0-539e9b8ae623-Agama-when-Node-f53e8a47-c36c-4487-8bd2-d66837b1b4fc-23e3938f-aeed-4d98-ac17-822cb908c9cd",
+			"type": "straight",
+			"source": "Agama-when-Node-e619ca76-95bb-4baf-99b0-539e9b8ae623",
+			"target": "Agama-when-Node-f53e8a47-c36c-4487-8bd2-d66837b1b4fc",
+			"label": "",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			},
+			"sourceHandle": "Agama-when-Node-e619ca76-95bb-4baf-99b0-539e9b8ae623.FAILURE"
+		},
+		{
+			"id": "Agama-when-Node-f53e8a47-c36c-4487-8bd2-d66837b1b4fc-Agama-assignment-Node-20656515-8514-471a-bfb5-1532ebcb1a8e-a969c7e5-8886-4dfa-86a8-431355ba68fe",
+			"type": "straight",
+			"source": "Agama-when-Node-f53e8a47-c36c-4487-8bd2-d66837b1b4fc",
+			"target": "Agama-assignment-Node-20656515-8514-471a-bfb5-1532ebcb1a8e",
+			"label": "Condition met",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			},
+			"sourceHandle": "Agama-when-Node-f53e8a47-c36c-4487-8bd2-d66837b1b4fc.SUCCESS"
+		},
+		{
+			"id": "Agama-repeat-Node-34862b8f-6f01-41d7-b101-138a1142008c-Agama-log-Node-7a6a1b92-ce0a-4bb2-8dac-abeeb608ca8a-022db492-ca0b-4424-9e50-14fc6c775b97",
+			"type": "straight",
+			"source": "Agama-repeat-Node-34862b8f-6f01-41d7-b101-138a1142008c",
+			"target": "Agama-log-Node-7a6a1b92-ce0a-4bb2-8dac-abeeb608ca8a",
+			"label": "Not In Block",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			},
+			"sourceHandle": "Agama-repeat-Node-34862b8f-6f01-41d7-b101-138a1142008c.InFlow"
+		},
+		{
+			"id": "Agama-log-Node-7a6a1b92-ce0a-4bb2-8dac-abeeb608ca8a-finish-0ba80e8c-7038-4bfa-9741-a32f7072f544-a72a5a48-fe94-41ce-8339-482a82c12740",
+			"type": "straight",
+			"source": "Agama-log-Node-7a6a1b92-ce0a-4bb2-8dac-abeeb608ca8a",
+			"target": "finish-0ba80e8c-7038-4bfa-9741-a32f7072f544",
+			"label": "",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			}
 		}
 	],
 	"viewport": {
-		"x": -2699.8671547705085,
-		"y": -704.3647456124258,
-		"zoom": 1.0000000000000009
+		"x": -1159.867154770509,
+		"y": 492.6352543875739,
+		"zoom": 1.000000000000001
 	}
 }
\ No newline at end of file

From 6338f546064312c0c9fac738fd1b15124bb957c0 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 13:00:51 +0530
Subject: [PATCH 21/32] feat: update org.gluu.agama.smtp.main.flow

---
 code/org.gluu.agama.smtp.main.flow | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/code/org.gluu.agama.smtp.main.flow b/code/org.gluu.agama.smtp.main.flow
index 359dd17..83b5137 100644
--- a/code/org.gluu.agama.smtp.main.flow
+++ b/code/org.gluu.agama.smtp.main.flow
@@ -44,5 +44,28 @@ max = Repeat 3 times max
                          // Assign User Id (email) to a variable
                          uid = userData.uid
                          // Finish the flow successfully
-                         it_zwwlp = {success:true, data: { userId: uid, uid: uid}}
-                         Finish it_zwwlp
\ No newline at end of file
+                         it_oxwag = {success:true, data: { userId: uid, uid: uid}}
+                         Finish it_oxwag
+          // When email verification is invalid
+          When emailVerificationResult.success is false
+               // Error variable assignment. 
+               emailObj.errorMessage = "Error sending email. Check email address and SMTP configuration."
+     // User with same email already exists
+     Log "@info User with e-mail % is known" email
+     // Run email verification sub-routine
+     emailVerificationResult = Trigger org.gluu.agama.smtp.emailVerification email true userData.context
+     // When email verification is successful
+     When emailVerificationResult.success is true
+          // Assigning user id (email) to a variable
+          uid = userData.uid
+          // Email verification and hence authentication is successful
+          it_femwr = {success:true, data: {userId: uid, uid: uid}}
+          Finish it_femwr
+     When emailVerificationResult.success is false
+          // Assigning error message to a variable
+          emailObj.errorMessage = "Error sending email. Check email address and SMTP configuration."
+// Fail if credential enrollment or authenticator flow failed
+Log "@info Fail if credential enrollment or authenticator flow failed"
+// Credential enrollment or authenticator flow failed
+it_lesne = {success:false, error: "Credential enrollment or authenticator flow failed"}
+Finish it_lesne
\ No newline at end of file

From 0ed2892e65b0dee936404677b8a66b9138727fe1 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 13:06:03 +0530
Subject: [PATCH 22/32] feat: update project.json


From 9fa26cc4d9b90ecb4533e6a9283125579a03e645 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 13:06:05 +0530
Subject: [PATCH 23/32] feat: update org.gluu.agama.smtp.main.json

---
 code/org.gluu.agama.smtp.main.json | 147 ++++++++++++++++-------------
 1 file changed, 79 insertions(+), 68 deletions(-)

diff --git a/code/org.gluu.agama.smtp.main.json b/code/org.gluu.agama.smtp.main.json
index fb2d507..ca12d37 100644
--- a/code/org.gluu.agama.smtp.main.json
+++ b/code/org.gluu.agama.smtp.main.json
@@ -32,7 +32,8 @@
 					"returnVariable": "Credential enrollment or authenticator flow failed",
 					"finishMode": "withFailure",
 					"nodeIcon": "material-symbols:line-end-square-rounded"
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
@@ -72,7 +73,8 @@
 					"logMessage": "\"Fail if credential enrollment or authenticator flow failed\"",
 					"logLevel": "info",
 					"nodeIcon": "octicon:log-16"
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
@@ -117,7 +119,8 @@
 						}
 					],
 					"nodeIcon": "material-symbols:equal"
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
@@ -165,7 +168,8 @@
 				"handles": [
 					"Agama-when-Node-f53e8a47-c36c-4487-8bd2-d66837b1b4fc.FAILURE",
 					"Agama-when-Node-f53e8a47-c36c-4487-8bd2-d66837b1b4fc.SUCCESS"
-				]
+				],
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
@@ -179,8 +183,8 @@
 			"height": 124,
 			"id": "finish-e77aeb14-5cb8-46d7-8942-a173da83c957",
 			"position": {
-				"x": 2479,
-				"y": -5.999999999999602
+				"x": 2475,
+				"y": 63.00000000000031
 			},
 			"type": "finish",
 			"data": {
@@ -191,8 +195,8 @@
 				"inRepeatBlock": true,
 				"handles": [],
 				"position": {
-					"x": 2479,
-					"y": -5.999999999999602
+					"x": 2475,
+					"y": 63.00000000000031
 				},
 				"agamaData": {
 					"id": "finish-e77aeb14-5cb8-46d7-8942-a173da83c957",
@@ -206,13 +210,14 @@
 					"returnVariable": "{userId: uid, uid: uid}",
 					"finishMode": "withSuccess",
 					"nodeIcon": "material-symbols:line-end-square-rounded"
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
 			"positionAbsolute": {
-				"x": 2479,
-				"y": -5.999999999999602
+				"x": 2475,
+				"y": 63.00000000000031
 			}
 		},
 		{
@@ -220,8 +225,8 @@
 			"height": 124,
 			"id": "Agama-assignment-Node-fc5e0c63-076c-4538-b3f5-861e46740aaa",
 			"position": {
-				"x": 2279,
-				"y": -5.999999999999602
+				"x": 2277,
+				"y": 64.00000000000031
 			},
 			"type": "assignment",
 			"data": {
@@ -231,8 +236,8 @@
 				"whenCondition": "WhenTrue",
 				"inRepeatBlock": true,
 				"position": {
-					"x": 2279,
-					"y": -5.999999999999602
+					"x": 2277,
+					"y": 64.00000000000031
 				},
 				"agamaData": {
 					"id": "Agama-assignment-Node-fc5e0c63-076c-4538-b3f5-861e46740aaa",
@@ -251,13 +256,14 @@
 						}
 					],
 					"nodeIcon": "material-symbols:equal"
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
 			"positionAbsolute": {
-				"x": 2279,
-				"y": -5.999999999999602
+				"x": 2277,
+				"y": 64.00000000000031
 			}
 		},
 		{
@@ -301,7 +307,8 @@
 				"handles": [
 					"Agama-when-Node-e619ca76-95bb-4baf-99b0-539e9b8ae623.FAILURE",
 					"Agama-when-Node-e619ca76-95bb-4baf-99b0-539e9b8ae623.SUCCESS"
-				]
+				],
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
@@ -343,7 +350,8 @@
 					"arguments": "email true userData.context",
 					"asssignedVariableName": "emailVerificationResult",
 					"exceptionVariableField": ""
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
@@ -383,7 +391,8 @@
 					"logMessage": "\"User with e-mail % is known\" email",
 					"logLevel": "info",
 					"nodeIcon": "octicon:log-16"
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
@@ -397,8 +406,8 @@
 			"height": 124,
 			"id": "Agama-assignment-Node-bf47f92c-efc2-4d45-97a6-e5ca6772c9e2",
 			"position": {
-				"x": 2376,
-				"y": 505.0000000000001
+				"x": 2567.5211239251466,
+				"y": 427.5209998666453
 			},
 			"type": "assignment",
 			"data": {
@@ -408,8 +417,8 @@
 				"whenCondition": "WhenTrue",
 				"inRepeatBlock": true,
 				"position": {
-					"x": 2376,
-					"y": 505.0000000000001
+					"x": 2567.5211239251466,
+					"y": 427.5209998666453
 				},
 				"agamaData": {
 					"id": "Agama-assignment-Node-bf47f92c-efc2-4d45-97a6-e5ca6772c9e2",
@@ -428,12 +437,13 @@
 						}
 					],
 					"nodeIcon": "material-symbols:equal"
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 2376,
-				"y": 505.0000000000001
+				"x": 2567.5211239251466,
+				"y": 427.5209998666453
 			},
 			"dragging": false
 		},
@@ -477,7 +487,8 @@
 				"handles": [
 					"Agama-when-Node-30f1f54c-16e2-4441-9dc6-7098a00bbd5e.FAILURE",
 					"Agama-when-Node-30f1f54c-16e2-4441-9dc6-7098a00bbd5e.SUCCESS"
-				]
+				],
+				"skake": false
 			},
 			"selected": false,
 			"dragging": false,
@@ -1370,8 +1381,8 @@
 			"height": 81,
 			"id": "Agama-note-ecf2fe6f-765d-4d6a-b6a2-3e91b59630fc",
 			"position": {
-				"x": 3054.57865528289,
-				"y": 823.0108923035444
+				"x": 3094.6239811945115,
+				"y": 807.3409821642142
 			},
 			"type": "notes",
 			"data": {
@@ -1379,15 +1390,15 @@
 				"type": "Agama-note",
 				"notes": "Show UI with successful user registration message. If the user clicks on continue button then finish the registration flow successfully.",
 				"position": {
-					"x": 3054.57865528289,
-					"y": 823.0108923035444
+					"x": 3094.6239811945115,
+					"y": 807.3409821642142
 				},
 				"skake": false
 			},
-			"selected": false,
+			"selected": true,
 			"positionAbsolute": {
-				"x": 3054.57865528289,
-				"y": 823.0108923035444
+				"x": 3094.6239811945115,
+				"y": 807.3409821642142
 			},
 			"dragging": false
 		},
@@ -1445,27 +1456,27 @@
 		},
 		{
 			"width": 270,
-			"height": 55,
+			"height": 68,
 			"id": "Agama-note-4888adb9-94c1-4e6e-9e6e-e8c82902c87a",
 			"position": {
-				"x": 2230.002823234996,
-				"y": 217.475806234831
+				"x": 2243.931632247734,
+				"y": 227.9224129943845
 			},
 			"type": "notes",
 			"data": {
 				"id": "Agama-note-4888adb9-94c1-4e6e-9e6e-e8c82902c87a",
 				"type": "Agama-note",
-				"notes": "Email OTP verification failed. Authentication is unsuccessful. Finish the flow.",
+				"notes": "Email OTP verification failed. Authentication is unsuccessful. Assign error message to a variable (shown on UI). ",
 				"position": {
-					"x": 2230.002823234996,
-					"y": 217.475806234831
+					"x": 2243.931632247734,
+					"y": 227.9224129943845
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 2230.002823234996,
-				"y": 217.475806234831
+				"x": 2243.931632247734,
+				"y": 227.9224129943845
 			},
 			"dragging": false
 		},
@@ -1474,8 +1485,8 @@
 			"height": 81,
 			"id": "Agama-note-24df480b-c97a-4611-b4ce-d54d068c13d3",
 			"position": {
-				"x": 1808.9999999999993,
-				"y": 342.0000000000001
+				"x": 1739.3559549363097,
+				"y": 368.1165168988838
 			},
 			"type": "notes",
 			"data": {
@@ -1483,41 +1494,41 @@
 				"type": "Agama-note",
 				"notes": "Call sub-routine which sends OTP to the email address and allows user to enter the same OTP on UI. If OTP matches the email verification is successful.",
 				"position": {
-					"x": 1808.9999999999993,
-					"y": 342.0000000000001
+					"x": 1739.3559549363097,
+					"y": 368.1165168988838
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 1808.9999999999993,
-				"y": 342.0000000000001
+				"x": 1739.3559549363097,
+				"y": 368.1165168988838
 			},
 			"dragging": false
 		},
 		{
 			"width": 270,
-			"height": 55,
+			"height": 68,
 			"id": "Agama-note-4460ad57-8273-4683-8b86-a51a9ffbba35",
 			"position": {
-				"x": 2391,
-				"y": -291
+				"x": 2590.9999999999995,
+				"y": -261
 			},
 			"type": "notes",
 			"data": {
 				"id": "Agama-note-4460ad57-8273-4683-8b86-a51a9ffbba35",
 				"type": "Agama-note",
-				"notes": "Email OTP verification failed. Authentication is unsuccessful. Finish the flow.",
+				"notes": "Email OTP verification failed. Authentication is unsuccessful. Assign error message to a variable (shown on UI). ",
 				"position": {
-					"x": 2391,
-					"y": -291
+					"x": 2590.9999999999995,
+					"y": -261
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 2391,
-				"y": -291
+				"x": 2590.9999999999995,
+				"y": -261
 			},
 			"dragging": false
 		},
@@ -1526,8 +1537,8 @@
 			"height": 55,
 			"id": "Agama-note-59c69197-43ef-487e-be24-25c0a288f415",
 			"position": {
-				"x": 2255,
-				"y": 54
+				"x": 2005.0000000000005,
+				"y": -7.999999999999943
 			},
 			"type": "notes",
 			"data": {
@@ -1535,15 +1546,15 @@
 				"type": "Agama-note",
 				"notes": "Email OTP verification successful. Authentication is successful. Finish the flow.",
 				"position": {
-					"x": 2255,
-					"y": 54
+					"x": 2005.0000000000005,
+					"y": -7.999999999999943
 				},
 				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 2255,
-				"y": 54
+				"x": 2005.0000000000005,
+				"y": -7.999999999999943
 			},
 			"dragging": false
 		},
@@ -1566,7 +1577,7 @@
 				},
 				"skake": false
 			},
-			"selected": true,
+			"selected": false,
 			"positionAbsolute": {
 				"x": 1789,
 				"y": -298.00000000000006
@@ -2334,8 +2345,8 @@
 		}
 	],
 	"viewport": {
-		"x": -1159.867154770509,
-		"y": 492.6352543875739,
-		"zoom": 1.000000000000001
+		"x": -2434.3495819023983,
+		"y": -465.44130366525997,
+		"zoom": 1.1486983549970373
 	}
 }
\ No newline at end of file

From 6a5ffc712fd714e3fed752a5699d057fdba2f9e7 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 13:06:07 +0530
Subject: [PATCH 24/32] feat: update org.gluu.agama.smtp.main.flow

---
 code/org.gluu.agama.smtp.main.flow | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/org.gluu.agama.smtp.main.flow b/code/org.gluu.agama.smtp.main.flow
index 83b5137..2605865 100644
--- a/code/org.gluu.agama.smtp.main.flow
+++ b/code/org.gluu.agama.smtp.main.flow
@@ -44,8 +44,8 @@ max = Repeat 3 times max
                          // Assign User Id (email) to a variable
                          uid = userData.uid
                          // Finish the flow successfully
-                         it_oxwag = {success:true, data: { userId: uid, uid: uid}}
-                         Finish it_oxwag
+                         it_dvowr = {success:true, data: { userId: uid, uid: uid}}
+                         Finish it_dvowr
           // When email verification is invalid
           When emailVerificationResult.success is false
                // Error variable assignment. 
@@ -59,13 +59,13 @@ max = Repeat 3 times max
           // Assigning user id (email) to a variable
           uid = userData.uid
           // Email verification and hence authentication is successful
-          it_femwr = {success:true, data: {userId: uid, uid: uid}}
-          Finish it_femwr
+          it_yjecp = {success:true, data: {userId: uid, uid: uid}}
+          Finish it_yjecp
      When emailVerificationResult.success is false
           // Assigning error message to a variable
           emailObj.errorMessage = "Error sending email. Check email address and SMTP configuration."
 // Fail if credential enrollment or authenticator flow failed
 Log "@info Fail if credential enrollment or authenticator flow failed"
 // Credential enrollment or authenticator flow failed
-it_lesne = {success:false, error: "Credential enrollment or authenticator flow failed"}
-Finish it_lesne
\ No newline at end of file
+it_edgce = {success:false, error: "Credential enrollment or authenticator flow failed"}
+Finish it_edgce
\ No newline at end of file

From f894103947ec41b59a4ade74ca8e5ac2fa353bb3 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 13:33:20 +0530
Subject: [PATCH 25/32] feat: update project.json

---
 project.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project.json b/project.json
index 1d44f76..3dc80bc 100644
--- a/project.json
+++ b/project.json
@@ -12,7 +12,8 @@
         "smtp"
     ],
     "noDirectLaunch": [
-        "org.gluu.agama.smtp.registration"
+        "org.gluu.agama.smtp.registration",
+        "org.gluu.agama.smtp.emailVerification"
     ],
     "configs": {
         "org.gluu.agama.smtp.main": {

From 2872e7f058ce991d9cf524d2ede69b4981876f80 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 13:33:23 +0530
Subject: [PATCH 26/32] feat: update org.gluu.agama.smtp.emailVerification.json

---
 ...org.gluu.agama.smtp.emailVerification.json | 312 ++++++++++++------
 1 file changed, 214 insertions(+), 98 deletions(-)

diff --git a/code/org.gluu.agama.smtp.emailVerification.json b/code/org.gluu.agama.smtp.emailVerification.json
index 8feee80..ba085ae 100644
--- a/code/org.gluu.agama.smtp.emailVerification.json
+++ b/code/org.gluu.agama.smtp.emailVerification.json
@@ -16,7 +16,8 @@
 				"position": {
 					"x": 2384.5375,
 					"y": 249
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
@@ -30,8 +31,8 @@
 			"height": 68,
 			"id": "Agama-note-6fe18f50-6dd4-45db-a707-e81e1e8ecff0",
 			"position": {
-				"x": 2260,
-				"y": 600
+				"x": 2285,
+				"y": 619
 			},
 			"type": "notes",
 			"data": {
@@ -39,14 +40,15 @@
 				"type": "Agama-note",
 				"notes": "When user entered OTP matches with the OTP sent to the email then finish the flow successfully.",
 				"position": {
-					"x": 2260,
-					"y": 600
-				}
+					"x": 2285,
+					"y": 619
+				},
+				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {
-				"x": 2260,
-				"y": 600
+				"x": 2285,
+				"y": 619
 			},
 			"dragging": false
 		},
@@ -69,7 +71,7 @@
 				},
 				"skake": false
 			},
-			"selected": true,
+			"selected": false,
 			"positionAbsolute": {
 				"x": 1877,
 				"y": 591
@@ -273,8 +275,8 @@
 			"height": 124,
 			"id": "Agama-assignment-Node-12aa1d08-8032-4e58-a8d4-173e7ab3da89",
 			"position": {
-				"x": 2392,
-				"y": 384
+				"x": 2780,
+				"y": 381
 			},
 			"type": "assignment",
 			"data": {
@@ -284,8 +286,8 @@
 				"whenCondition": "WhenFalse",
 				"inRepeatBlock": true,
 				"position": {
-					"x": 2392,
-					"y": 384
+					"x": 2780,
+					"y": 381
 				},
 				"agamaData": {
 					"id": "Agama-assignment-Node-12aa1d08-8032-4e58-a8d4-173e7ab3da89",
@@ -304,19 +306,19 @@
 						},
 						{
 							"variableTypeCheck": false,
-							"assignmentExpression": "false",
-							"assignedVariableName": "uiInput.resent"
+							"assignmentExpression": "true",
+							"assignedVariableName": "sendMail"
 						}
 					],
 					"nodeIcon": "material-symbols:equal"
 				},
 				"skake": false
 			},
-			"selected": false,
+			"selected": true,
 			"dragging": false,
 			"positionAbsolute": {
-				"x": 2392,
-				"y": 384
+				"x": 2780,
+				"y": 381
 			}
 		},
 		{
@@ -324,8 +326,8 @@
 			"height": 124,
 			"id": "finish-79eca692-8dbd-41ce-a6c3-ad2f3f73cf9d",
 			"position": {
-				"x": 2260,
-				"y": 773
+				"x": 2549,
+				"y": 772
 			},
 			"type": "finish",
 			"data": {
@@ -339,8 +341,8 @@
 					"Agama-when-Node-15f282e9-c33a-4ff3-81ee-0342c22af6fd.SUCCESS"
 				],
 				"position": {
-					"x": 2260,
-					"y": 773
+					"x": 2549,
+					"y": 772
 				},
 				"agamaData": {
 					"id": "finish-79eca692-8dbd-41ce-a6c3-ad2f3f73cf9d",
@@ -360,8 +362,8 @@
 			"selected": false,
 			"dragging": false,
 			"positionAbsolute": {
-				"x": 2260,
-				"y": 773
+				"x": 2549,
+				"y": 772
 			}
 		},
 		{
@@ -369,7 +371,7 @@
 			"height": 140,
 			"id": "Agama-when-Node-15f282e9-c33a-4ff3-81ee-0342c22af6fd",
 			"position": {
-				"x": 2142,
+				"x": 2431,
 				"y": 438
 			},
 			"parentId": "Agama-when-Node-c6c0165d-f2d3-4a32-be62-59a35d309eaa",
@@ -381,7 +383,7 @@
 				"whenCondition": "WhenFalse",
 				"inRepeatBlock": true,
 				"position": {
-					"x": 2142,
+					"x": 2431,
 					"y": 438
 				},
 				"agamaData": {
@@ -394,7 +396,15 @@
 					"comment": "When passcode entered by user matches",
 					"hasComment": true,
 					"inRepeatBlock": true,
-					"hasFailure": true
+					"hasFailure": true,
+					"conditions": [
+						{
+							"variable": "uiInput.passcode",
+							"operator": "is",
+							"dataValue": "otpCode",
+							"combinator": "none"
+						}
+					]
 				},
 				"handles": [
 					"Agama-when-Node-15f282e9-c33a-4ff3-81ee-0342c22af6fd.FAILURE",
@@ -405,7 +415,7 @@
 			"selected": false,
 			"dragging": false,
 			"positionAbsolute": {
-				"x": 2142,
+				"x": 2431,
 				"y": 438
 			}
 		},
@@ -414,7 +424,7 @@
 			"height": 124,
 			"id": "Agama-assignment-Node-a1d8727e-17e1-4d1c-a019-0de6f3123e79",
 			"position": {
-				"x": 2005,
+				"x": 2265,
 				"y": 781
 			},
 			"type": "assignment",
@@ -425,7 +435,7 @@
 				"whenCondition": "WhenTrue",
 				"inRepeatBlock": true,
 				"position": {
-					"x": 2005,
+					"x": 2265,
 					"y": 781
 				},
 				"agamaData": {
@@ -456,56 +466,10 @@
 			"selected": false,
 			"dragging": false,
 			"positionAbsolute": {
-				"x": 2005,
+				"x": 2265,
 				"y": 781
 			}
 		},
-		{
-			"width": 210,
-			"height": 140,
-			"id": "Agama-when-Node-c6c0165d-f2d3-4a32-be62-59a35d309eaa",
-			"position": {
-				"x": 1892,
-				"y": 438
-			},
-			"parentId": "Agama-rrf-Node-2af7afda-3da6-48ed-9183-d887ec00e394",
-			"type": "when",
-			"data": {
-				"id": "Agama-when-Node-c6c0165d-f2d3-4a32-be62-59a35d309eaa",
-				"type": "Agama-when-Node",
-				"parentId": "Agama-rrf-Node-2af7afda-3da6-48ed-9183-d887ec00e394",
-				"whenCondition": "",
-				"inRepeatBlock": true,
-				"position": {
-					"x": 1892,
-					"y": 438
-				},
-				"agamaData": {
-					"id": "Agama-when-Node-c6c0165d-f2d3-4a32-be62-59a35d309eaa",
-					"parentId": "Agama-rrf-Node-2af7afda-3da6-48ed-9183-d887ec00e394",
-					"type": "Agama-when-Node",
-					"variableField": "uiInput.resend",
-					"conditionInputField": "is",
-					"valueField": "\"\"",
-					"comment": "If user clicked on \"resend code\" button",
-					"hasComment": true,
-					"inRepeatBlock": true,
-					"hasSuccess": true,
-					"hasFailure": true
-				},
-				"handles": [
-					"Agama-when-Node-c6c0165d-f2d3-4a32-be62-59a35d309eaa.FAILURE",
-					"Agama-when-Node-c6c0165d-f2d3-4a32-be62-59a35d309eaa.SUCCESS"
-				],
-				"skake": false
-			},
-			"selected": false,
-			"dragging": false,
-			"positionAbsolute": {
-				"x": 1892,
-				"y": 438
-			}
-		},
 		{
 			"width": 170,
 			"height": 124,
@@ -587,6 +551,16 @@
 							"variableTypeCheck": false,
 							"assignmentExpression": "existingAccount",
 							"assignedVariableName": "emailObj.accountExists"
+						},
+						{
+							"variableTypeCheck": false,
+							"assignmentExpression": "uiInput.matches",
+							"assignedVariableName": "emailObj.matches"
+						},
+						{
+							"variableTypeCheck": false,
+							"assignmentExpression": "uiInput.resent",
+							"assignedVariableName": "emailObj.resent"
 						}
 					],
 					"nodeIcon": "material-symbols:equal"
@@ -719,7 +693,15 @@
 					"hasComment": true,
 					"inRepeatBlock": true,
 					"hasSuccess": true,
-					"hasFailure": true
+					"hasFailure": true,
+					"conditions": [
+						{
+							"variable": "otpCode",
+							"operator": "is",
+							"dataValue": "null",
+							"combinator": "none"
+						}
+					]
 				},
 				"handles": [
 					"Agama-when-Node-4cd5cf1e-4cbd-4b0c-b7ef-df6bd263b731.FAILURE",
@@ -859,7 +841,15 @@
 					"comment": "When send mail is allowed",
 					"hasComment": true,
 					"inRepeatBlock": true,
-					"hasSuccess": true
+					"hasSuccess": true,
+					"conditions": [
+						{
+							"variable": "sendMail",
+							"operator": "is",
+							"dataValue": "true",
+							"combinator": "none"
+						}
+					]
 				},
 				"handles": [
 					"Agama-when-Node-20b6dfad-800b-4e04-98f9-fbfb4332ca78.FAILURE",
@@ -1002,6 +992,11 @@
 							"variableTypeCheck": false,
 							"assignmentExpression": "true",
 							"assignedVariableName": "sendMail"
+						},
+						{
+							"variableTypeCheck": false,
+							"assignmentExpression": "{matches: true, resent: false}",
+							"assignedVariableName": "uiInput"
 						}
 					],
 					"nodeIcon": "material-symbols:equal"
@@ -1056,6 +1051,110 @@
 				"x": 30,
 				"y": 30
 			}
+		},
+		{
+			"width": 170,
+			"height": 124,
+			"id": "Agama-assignment-Node-c625cba5-70f6-4f0a-852b-134d59d537cd",
+			"position": {
+				"x": 1923,
+				"y": 439
+			},
+			"type": "assignment",
+			"data": {
+				"id": "Agama-assignment-Node-c625cba5-70f6-4f0a-852b-134d59d537cd",
+				"type": "Agama-assignment-Node",
+				"parentId": "Agama-rrf-Node-2af7afda-3da6-48ed-9183-d887ec00e394",
+				"whenCondition": "",
+				"inRepeatBlock": true,
+				"position": {
+					"x": 1923,
+					"y": 439
+				},
+				"agamaData": {
+					"id": "Agama-assignment-Node-c625cba5-70f6-4f0a-852b-134d59d537cd",
+					"parentId": "Agama-rrf-Node-2af7afda-3da6-48ed-9183-d887ec00e394",
+					"type": "Agama-assignment-Node",
+					"displayName": "",
+					"hasComment": true,
+					"comment": "",
+					"whenCondition": "",
+					"inRepeatBlock": true,
+					"assignments": [
+						{
+							"variableTypeCheck": false,
+							"assignmentExpression": "false",
+							"assignedVariableName": "uiInput.resent"
+						}
+					],
+					"nodeIcon": "material-symbols:equal"
+				}
+			},
+			"selected": false,
+			"positionAbsolute": {
+				"x": 1923,
+				"y": 439
+			},
+			"dragging": false
+		},
+		{
+			"width": 210,
+			"height": 140,
+			"id": "Agama-when-Node-c6c0165d-f2d3-4a32-be62-59a35d309eaa",
+			"position": {
+				"x": 2150,
+				"y": 438
+			},
+			"parentId": "Agama-assignment-Node-c625cba5-70f6-4f0a-852b-134d59d537cd",
+			"type": "when",
+			"data": {
+				"id": "Agama-when-Node-c6c0165d-f2d3-4a32-be62-59a35d309eaa",
+				"type": "Agama-when-Node",
+				"parentId": "Agama-assignment-Node-c625cba5-70f6-4f0a-852b-134d59d537cd",
+				"whenCondition": "",
+				"inRepeatBlock": "",
+				"position": {
+					"x": 2150,
+					"y": 438
+				},
+				"agamaData": {
+					"id": "Agama-when-Node-c6c0165d-f2d3-4a32-be62-59a35d309eaa",
+					"parentId": "Agama-assignment-Node-c625cba5-70f6-4f0a-852b-134d59d537cd",
+					"type": "Agama-when-Node",
+					"variableField": "uiInput.resend",
+					"conditionInputField": "is",
+					"valueField": "\"\"",
+					"comment": "If user clicked on \"resend code\" button",
+					"hasComment": true,
+					"inRepeatBlock": true,
+					"hasSuccess": true,
+					"hasFailure": true,
+					"conditions": [
+						{
+							"variable": "uiInput.resend",
+							"operator": "is",
+							"dataValue": "\"\"",
+							"combinator": "none"
+						}
+					],
+					"position": {
+						"x": 2042
+					}
+				},
+				"handles": [
+					"Agama-when-Node-c6c0165d-f2d3-4a32-be62-59a35d309eaa.FAILURE",
+					"Agama-when-Node-c6c0165d-f2d3-4a32-be62-59a35d309eaa.SUCCESS"
+				],
+				"skake": false
+			},
+			"selected": false,
+			"dragging": false,
+			"positionAbsolute": {
+				"x": 2150,
+				"y": 438
+			},
+			"whenCondition": "",
+			"inRepeatBlock": ""
 		}
 	],
 	"edges": [
@@ -1250,23 +1349,6 @@
 				"fillOpacity": 0.7
 			}
 		},
-		{
-			"id": "Agama-rrf-Node-2af7afda-3da6-48ed-9183-d887ec00e394-Agama-when-Node-c6c0165d-f2d3-4a32-be62-59a35d309eaa-3a3bdd52-9e71-4b29-9f08-04871836453e",
-			"type": "straight",
-			"source": "Agama-rrf-Node-2af7afda-3da6-48ed-9183-d887ec00e394",
-			"target": "Agama-when-Node-c6c0165d-f2d3-4a32-be62-59a35d309eaa",
-			"label": "",
-			"labelBgPadding": [
-				8,
-				4
-			],
-			"labelBgBorderRadius": 4,
-			"labelBgStyle": {
-				"fill": "#FFCC00",
-				"color": "#fff",
-				"fillOpacity": 0.7
-			}
-		},
 		{
 			"id": "Agama-when-Node-c6c0165d-f2d3-4a32-be62-59a35d309eaa-Agama-assignment-Node-a1d8727e-17e1-4d1c-a019-0de6f3123e79-b77fe830-86aa-484f-b433-cfdb84a3aa64",
 			"type": "straight",
@@ -1373,11 +1455,45 @@
 				"color": "#fff",
 				"fillOpacity": 0.7
 			}
+		},
+		{
+			"id": "Agama-rrf-Node-2af7afda-3da6-48ed-9183-d887ec00e394-Agama-assignment-Node-c625cba5-70f6-4f0a-852b-134d59d537cd-52617886-a3fc-4d70-9f29-72523785b65b",
+			"type": "straight",
+			"source": "Agama-rrf-Node-2af7afda-3da6-48ed-9183-d887ec00e394",
+			"target": "Agama-assignment-Node-c625cba5-70f6-4f0a-852b-134d59d537cd",
+			"label": "",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			}
+		},
+		{
+			"id": "Agama-assignment-Node-c625cba5-70f6-4f0a-852b-134d59d537cd-Agama-when-Node-c6c0165d-f2d3-4a32-be62-59a35d309eaa-cbcbf59c-6145-4b10-aba8-d12eb8cb1e96",
+			"type": "straight",
+			"source": "Agama-assignment-Node-c625cba5-70f6-4f0a-852b-134d59d537cd",
+			"target": "Agama-when-Node-c6c0165d-f2d3-4a32-be62-59a35d309eaa",
+			"label": "",
+			"labelBgPadding": [
+				8,
+				4
+			],
+			"labelBgBorderRadius": 4,
+			"labelBgStyle": {
+				"fill": "#FFCC00",
+				"color": "#fff",
+				"fillOpacity": 0.7
+			}
 		}
 	],
 	"viewport": {
-		"x": 51.46250000000009,
-		"y": 194,
+		"x": -1656,
+		"y": -153,
 		"zoom": 1
 	}
 }
\ No newline at end of file

From 723d00112c2bde61b6e6b81e9d6176478ba5ca1a Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 13:33:24 +0530
Subject: [PATCH 27/32] feat: update org.gluu.agama.smtp.emailVerification.flow

---
 code/org.gluu.agama.smtp.emailVerification.flow | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/org.gluu.agama.smtp.emailVerification.flow b/code/org.gluu.agama.smtp.emailVerification.flow
index 0f2ad9b..97ad035 100644
--- a/code/org.gluu.agama.smtp.emailVerification.flow
+++ b/code/org.gluu.agama.smtp.emailVerification.flow
@@ -5,10 +5,11 @@ Flow org.gluu.agama.smtp.emailVerification
 // Initialize variables
 emailObj = {}
 sendMail = true
+uiInput = {matches: true, resent: false}
 // Get instance email service
 emailService = Call org.gluu.agama.smtp.EmailService#getInstance 
 // Iterate x times max
-Repeat 3 times max
+max = Repeat 3 times max
      // When send mail is allowed
      When sendMail is true
           // Tun off send mail
@@ -24,8 +25,11 @@ Repeat 3 times max
           // Variable assignment after successful email delivery
           emailObj.email = email
           emailObj.accountExists = existingAccount
+          emailObj.matches = uiInput.matches
+          emailObj.resent = uiInput.resent
           // Redirect to page asking for OTP received using email
           uiInput = RRF "otp.ftlh" emailObj
+          uiInput.resent = false
           // If user clicked on "resend code" button
           When uiInput.resend is ""
                // Variable assignment when user clicked on "resend code" button
@@ -36,7 +40,7 @@ Repeat 3 times max
                Finish true
           // Variable assigned when OTP entered by user does not matches
           uiInput.matches = false
-          uiInput.resent = false
+          sendMail = true
 // Variable assignment when user exceeds the number of attempts allowed
 obj = { success: false, error: "You have exceeded the number of attempts allowed" }
 // Finish flow when user exceeds maximum number of flows allowed

From 4b7ee398d82018572176e2103dc18c079e379f11 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 13:36:08 +0530
Subject: [PATCH 28/32] feat: update project.json


From de1865f08b12b4b6df6e23d396e9ab9357fffb58 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 13:36:11 +0530
Subject: [PATCH 29/32] feat: update org.gluu.agama.smtp.emailVerification.json

---
 code/org.gluu.agama.smtp.emailVerification.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/org.gluu.agama.smtp.emailVerification.json b/code/org.gluu.agama.smtp.emailVerification.json
index ba085ae..d50b0a1 100644
--- a/code/org.gluu.agama.smtp.emailVerification.json
+++ b/code/org.gluu.agama.smtp.emailVerification.json
@@ -1088,7 +1088,8 @@
 						}
 					],
 					"nodeIcon": "material-symbols:equal"
-				}
+				},
+				"skake": false
 			},
 			"selected": false,
 			"positionAbsolute": {

From dd2a457ecd5e071f8a37087d5c1e41b46dbb2711 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 13:36:12 +0530
Subject: [PATCH 30/32] feat: update org.gluu.agama.smtp.emailVerification.flow


From efacbcbde28f92ede51635b5a7113ddd59455460 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 16:57:58 +0530
Subject: [PATCH 31/32] feat: update acknowledgement.ftlh

---
 web/acknowledgement.ftlh | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/web/acknowledgement.ftlh b/web/acknowledgement.ftlh
index ff25b31..aabba69 100644
--- a/web/acknowledgement.ftlh
+++ b/web/acknowledgement.ftlh
@@ -3,11 +3,7 @@
 <html lang="en">
 <head><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>Acknowledgement
 	</title><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tailwindcss@2.2/dist/tailwind.min.css" type="text/css"></head>
-<body>[#ftl output_format="HTML"]
-
-
-
-
+<body>
 
   
 	
@@ -49,11 +45,6 @@
   
   
   
-
-
-  
-  
-  
 </body>
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/i18next/2.0.22/i18next.min.js"></script><script src="./locale/loc-i18next.js"></script><script>

From 132df3a89b5ab384c7ffab52d226986668f0f194 Mon Sep 17 00:00:00 2001
From: Arnab Dutta <arnab.bdutta@gmail.com>
Date: Wed, 31 Jan 2024 17:03:52 +0530
Subject: [PATCH 32/32] feat: update profile.ftlh

---
 web/profile.ftlh | 93 +++++++++++++++++++++---------------------------
 1 file changed, 41 insertions(+), 52 deletions(-)

diff --git a/web/profile.ftlh b/web/profile.ftlh
index e687c14..d990cdb 100644
--- a/web/profile.ftlh
+++ b/web/profile.ftlh
@@ -3,11 +3,7 @@
 <html lang="en">
 <head><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>Registration Form
 	</title><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tailwindcss@2.2/dist/tailwind.min.css" type="text/css"></head>
-<body>[#ftl output_format="HTML"]
-
-
-
-
+<body>
 
   
 	
@@ -16,8 +12,7 @@
 	
 	
   
-  
-	<div id="content" class="md:h-screen bg-white relative flex flex-col justify-center items-center">
+  <div id="content" class="md:h-screen bg-white relative flex flex-col justify-center items-center">
 	  <div class="md:border md:border-gray-300 bg-white md:shadow-lg shadow-none rounded p-10 align-middle">
 		<div class="flex flex-col items-center space-y-3">
 		  <div class="flex">
@@ -31,54 +26,45 @@
 		  <div class="grid grid-cols-2 gap-2">
 		  </div>
 		  <div id="iyplr">
-		  <div class="relative mb-2">
-			<label for="givenName" data-i18n="profile.first_name" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
-			</label>
-			<input type="text" id="givenName" name="givenName" autofocus="" placeholder="John" value="${name!}" required="" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
-		  </div>
-		  <div class="relative mb-2">
-			<label for="lastname" data-i18n="profile.last_name" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
-			</label>
-			<input type="text" id="sn" name="sn" autofocus="" placeholder="Doe" required="" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
-		  </div>
-		  <div class="relative mb-2">
-			<label for="displayName" data-i18n="profile.display_name" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
-			</label>
-			<input type="text" id="displayName" name="displayName" autofocus="" placeholder="John" required="" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
-		  </div>	
-		  <div class="relative mb-2">
-			<label for="company" data-i18n="profile.company" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
-			</label>
-			<input type="text" id="o" name="o" autofocus="" placeholder="Company's Name" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
-		  </div>
-
 			<div class="relative mb-2">
-				<label for="country" data-i18n="profile.country" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
-				</label>
-			  <select type="text" id="c" name="c" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
-			  <option>select...</option><option value="AF">Afghanistan</option><option value="AX">Aland Islands</option><option value="AL">Albania</option><option value="DZ">Algeria</option><option value="AS">American Samoa</option><option value="AD">Andorra</option><option value="AO">Angola</option><option value="AI">Anguilla</option><option value="AQ">Antarctica</option><option value="AG">Antigua and Barbuda</option><option value="AR">Argentina</option><option value="AM">Armenia</option><option value="AW">Aruba</option><option value="AU">Australia</option><option value="AT">Austria</option><option value="AZ">Azerbaijan</option><option value="BS">Bahamas</option><option value="BH">Bahrain</option><option value="BD">Bangladesh</option><option value="BB">Barbados</option><option value="BY">Belarus</option><option value="BE">Belgium</option><option value="BZ">Belize</option><option value="BJ">Benin</option><option value="BM">Bermuda</option><option value="BT">Bhutan</option><option value="BO">Bolivia</option><option value="BQ">Bonaire, Sint Eustatius and Saba</option><option value="BA">Bosnia and Herzegovina</option><option value="BW">Botswana</option><option value="BV">Bouvet Island</option><option value="BR">Brazil</option><option value="IO">British Indian Ocean Territory</option><option value="BN">Brunei Darussalam</option><option value="BG">Bulgaria</option><option value="BF">Burkina Faso</option><option value="BI">Burundi</option><option value="KH">Cambodia</option><option value="CM">Cameroon</option><option value="CA">Canada</option><option value="CV">Cape Verde</option><option value="KY">Cayman Islands</option><option value="CF">Central African Republic</option><option value="TD">Chad</option><option value="CL">Chile</option><option value="CN">China</option><option value="CX">Christmas Island</option><option value="CC">Cocos (Keeling) Islands</option><option value="CO">Colombia</option><option value="KM">Comoros</option><option value="CG">Congo</option><option value="CD">Congo, Democratic Republic of the Congo</option><option value="CK">Cook Islands</option><option value="CR">Costa Rica</option><option value="CI">Cote D'Ivoire</option><option value="HR">Croatia</option><option value="CU">Cuba</option><option value="CW">Curacao</option><option value="CY">Cyprus</option><option value="CZ">Czech Republic</option><option value="DK">Denmark</option><option value="DJ">Djibouti</option><option value="DM">Dominica</option><option value="DO">Dominican Republic</option><option value="EC">Ecuador</option><option value="EG">Egypt</option><option value="SV">El Salvador</option><option value="GQ">Equatorial Guinea</option><option value="ER">Eritrea</option><option value="EE">Estonia</option><option value="ET">Ethiopia</option><option value="FK">Falkland Islands (Malvinas)</option><option value="FO">Faroe Islands</option><option value="FJ">Fiji</option><option value="FI">Finland</option><option value="FR">France</option><option value="GF">French Guiana</option><option value="PF">French Polynesia</option><option value="TF">French Southern Territories</option><option value="GA">Gabon</option><option value="GM">Gambia</option><option value="GE">Georgia</option><option value="DE">Germany</option><option value="GH">Ghana</option><option value="GI">Gibraltar</option><option value="GR">Greece</option><option value="GL">Greenland</option><option value="GD">Grenada</option><option value="GP">Guadeloupe</option><option value="GU">Guam</option><option value="GT">Guatemala</option><option value="GG">Guernsey</option><option value="GN">Guinea</option><option value="GW">Guinea-Bissau</option><option value="GY">Guyana</option><option value="HT">Haiti</option><option value="HM">Heard Island and Mcdonald Islands</option><option value="VA">Holy See (Vatican City State)</option><option value="HN">Honduras</option><option value="HK">Hong Kong</option><option value="HU">Hungary</option><option value="IS">Iceland</option><option value="IN">India</option><option value="ID">Indonesia</option><option value="IR">Iran, Islamic Republic of</option><option value="IQ">Iraq</option><option value="IE">Ireland</option><option value="IM">Isle of Man</option><option value="IL">Israel</option><option value="IT">Italy</option><option value="JM">Jamaica</option><option value="JP">Japan</option><option value="JE">Jersey</option><option value="JO">Jordan</option><option value="KZ">Kazakhstan</option><option value="KE">Kenya</option><option value="KI">Kiribati</option><option value="KP">Korea, Democratic People's Republic of</option><option value="KR">Korea, Republic of</option><option value="XK">Kosovo</option><option value="KW">Kuwait</option><option value="KG">Kyrgyzstan</option><option value="LA">Lao People's Democratic Republic</option><option value="LV">Latvia</option><option value="LB">Lebanon</option><option value="LS">Lesotho</option><option value="LR">Liberia</option><option value="LY">Libyan Arab Jamahiriya</option><option value="LI">Liechtenstein</option><option value="LT">Lithuania</option><option value="LU">Luxembourg</option><option value="MO">Macao</option><option value="MK">Macedonia, the Former Yugoslav Republic of</option><option value="MG">Madagascar</option><option value="MW">Malawi</option><option value="MY">Malaysia</option><option value="MV">Maldives</option><option value="ML">Mali</option><option value="MT">Malta</option><option value="MH">Marshall Islands</option><option value="MQ">Martinique</option><option value="MR">Mauritania</option><option value="MU">Mauritius</option><option value="YT">Mayotte</option><option value="MX">Mexico</option><option value="FM">Micronesia, Federated States of</option><option value="MD">Moldova, Republic of</option><option value="MC">Monaco</option><option value="MN">Mongolia</option><option value="ME">Montenegro</option><option value="MS">Montserrat</option><option value="MA">Morocco</option><option value="MZ">Mozambique</option><option value="MM">Myanmar</option><option value="NA">Namibia</option><option value="NR">Nauru</option><option value="NP">Nepal</option><option value="NL">Netherlands</option><option value="AN">Netherlands Antilles</option><option value="NC">New Caledonia</option><option value="NZ">New Zealand</option><option value="NI">Nicaragua</option><option value="NE">Niger</option><option value="NG">Nigeria</option><option value="NU">Niue</option><option value="NF">Norfolk Island</option><option value="MP">Northern Mariana Islands</option><option value="NO">Norway</option><option value="OM">Oman</option><option value="PK">Pakistan</option><option value="PW">Palau</option><option value="PS">Palestinian Territory, Occupied</option><option value="PA">Panama</option><option value="PG">Papua New Guinea</option><option value="PY">Paraguay</option><option value="PE">Peru</option><option value="PH">Philippines</option><option value="PN">Pitcairn</option><option value="PL">Poland</option><option value="PT">Portugal</option><option value="PR">Puerto Rico</option><option value="QA">Qatar</option><option value="RE">Reunion</option><option value="RO">Romania</option><option value="RU">Russian Federation</option><option value="RW">Rwanda</option><option value="BL">Saint Barthelemy</option><option value="SH">Saint Helena</option><option value="KN">Saint Kitts and Nevis</option><option value="LC">Saint Lucia</option><option value="MF">Saint Martin</option><option value="PM">Saint Pierre and Miquelon</option><option value="VC">Saint Vincent and the Grenadines</option><option value="WS">Samoa</option><option value="SM">San Marino</option><option value="ST">Sao Tome and Principe</option><option value="SA">Saudi Arabia</option><option value="SN">Senegal</option><option value="RS">Serbia</option><option value="CS">Serbia and Montenegro</option><option value="SC">Seychelles</option><option value="SL">Sierra Leone</option><option value="SG">Singapore</option><option value="SX">Sint Maarten</option><option value="SK">Slovakia</option><option value="SI">Slovenia</option><option value="SB">Solomon Islands</option><option value="SO">Somalia</option><option value="ZA">South Africa</option><option value="GS">South Georgia and the South Sandwich Islands</option><option value="SS">South Sudan</option><option value="ES">Spain</option><option value="LK">Sri Lanka</option><option value="SD">Sudan</option><option value="SR">Suriname</option><option value="SJ">Svalbard and Jan Mayen</option><option value="SZ">Swaziland</option><option value="SE">Sweden</option><option value="CH">Switzerland</option><option value="SY">Syrian Arab Republic</option><option value="TW">Taiwan, Province of China</option><option value="TJ">Tajikistan</option><option value="TZ">Tanzania, United Republic of</option><option value="TH">Thailand</option><option value="TL">Timor-Leste</option><option value="TG">Togo</option><option value="TK">Tokelau</option><option value="TO">Tonga</option><option value="TT">Trinidad and Tobago</option><option value="TN">Tunisia</option><option value="TR">Turkey</option><option value="TM">Turkmenistan</option><option value="TC">Turks and Caicos Islands</option><option value="TV">Tuvalu</option><option value="UG">Uganda</option><option value="UA">Ukraine</option><option value="AE">United Arab Emirates</option><option value="GB">United Kingdom</option><option value="US" selected="">United States</option><option value="UM">United States Minor Outlying Islands</option><option value="UY">Uruguay</option><option value="UZ">Uzbekistan</option><option value="VU">Vanuatu</option><option value="VE">Venezuela</option><option value="VN">Viet Nam</option><option value="VG">Virgin Islands, British</option><option value="VI">Virgin Islands, U.s.</option><option value="WF">Wallis and Futuna</option><option value="EH">Western Sahara</option><option value="YE">Yemen</option><option value="ZM">Zambia</option><option value="ZW">Zimbabwe</option></select>
+			  <label for="givenName" data-i18n="profile.first_name" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
+			  </label>
+			  <input type="text" id="givenName" name="givenName" autofocus="" placeholder="John" value="${name!}" required="" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
+			</div>
+			<div class="relative mb-2">
+			  <label for="lastname" data-i18n="profile.last_name" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
+			  </label>
+			  <input type="text" id="sn" name="sn" autofocus="" placeholder="Doe" required="" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
+			</div>
+			<div class="relative mb-2">
+			  <label for="displayName" data-i18n="profile.display_name" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
+			  </label>
+			  <input type="text" id="displayName" name="displayName" autofocus="" placeholder="John" required="" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
 			</div>
 			<div class="relative mb-2">
-				<label for="jansTitle" data-i18n="profile.job_title" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
-				</label>
-				<input type="text" id="jansTitle" name="jansTitle" autofocus="" placeholder="Architect" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
+			  <label for="company" data-i18n="profile.company" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
+			  </label>
+			  <input type="text" id="o" name="o" autofocus="" placeholder="Company's Name" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
 			</div>
 			<div class="relative mb-2">
-				<label for="occupation" data-i18n="profile.I_am_an" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
-				</label>
-				<select id="jansRole" name="jansRole" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
-					<option value="Architect" data-i18n="profile.architect"></option>
-					<option value="Developer" data-i18n="profile.developer"></option>
-					<option value="Researcher" data-i18n="profile.researcher"></option>
-					<option value="Student" data-i18n="profile.student"></option>
-					<option value="Other" data-i18n="profile.other"></option>
-				</select>
+			  <label for="country" data-i18n="profile.country" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
+			  </label>
+			  <select type="text" id="c" name="c" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2"><option>select...</option><option value="AF">Afghanistan</option><option value="AX">Aland Islands</option><option value="AL">Albania</option><option value="DZ">Algeria</option><option value="AS">American Samoa</option><option value="AD">Andorra</option><option value="AO">Angola</option><option value="AI">Anguilla</option><option value="AQ">Antarctica</option><option value="AG">Antigua and Barbuda</option><option value="AR">Argentina</option><option value="AM">Armenia</option><option value="AW">Aruba</option><option value="AU">Australia</option><option value="AT">Austria</option><option value="AZ">Azerbaijan</option><option value="BS">Bahamas</option><option value="BH">Bahrain</option><option value="BD">Bangladesh</option><option value="BB">Barbados</option><option value="BY">Belarus</option><option value="BE">Belgium</option><option value="BZ">Belize</option><option value="BJ">Benin</option><option value="BM">Bermuda</option><option value="BT">Bhutan</option><option value="BO">Bolivia</option><option value="BQ">Bonaire, Sint Eustatius and Saba</option><option value="BA">Bosnia and Herzegovina</option><option value="BW">Botswana</option><option value="BV">Bouvet Island</option><option value="BR">Brazil</option><option value="IO">British Indian Ocean Territory</option><option value="BN">Brunei Darussalam</option><option value="BG">Bulgaria</option><option value="BF">Burkina Faso</option><option value="BI">Burundi</option><option value="KH">Cambodia</option><option value="CM">Cameroon</option><option value="CA">Canada</option><option value="CV">Cape Verde</option><option value="KY">Cayman Islands</option><option value="CF">Central African Republic</option><option value="TD">Chad</option><option value="CL">Chile</option><option value="CN">China</option><option value="CX">Christmas Island</option><option value="CC">Cocos (Keeling) Islands</option><option value="CO">Colombia</option><option value="KM">Comoros</option><option value="CG">Congo</option><option value="CD">Congo, Democratic Republic of the Congo</option><option value="CK">Cook Islands</option><option value="CR">Costa Rica</option><option value="CI">Cote D'Ivoire</option><option value="HR">Croatia</option><option value="CU">Cuba</option><option value="CW">Curacao</option><option value="CY">Cyprus</option><option value="CZ">Czech Republic</option><option value="DK">Denmark</option><option value="DJ">Djibouti</option><option value="DM">Dominica</option><option value="DO">Dominican Republic</option><option value="EC">Ecuador</option><option value="EG">Egypt</option><option value="SV">El Salvador</option><option value="GQ">Equatorial Guinea</option><option value="ER">Eritrea</option><option value="EE">Estonia</option><option value="ET">Ethiopia</option><option value="FK">Falkland Islands (Malvinas)</option><option value="FO">Faroe Islands</option><option value="FJ">Fiji</option><option value="FI">Finland</option><option value="FR">France</option><option value="GF">French Guiana</option><option value="PF">French Polynesia</option><option value="TF">French Southern Territories</option><option value="GA">Gabon</option><option value="GM">Gambia</option><option value="GE">Georgia</option><option value="DE">Germany</option><option value="GH">Ghana</option><option value="GI">Gibraltar</option><option value="GR">Greece</option><option value="GL">Greenland</option><option value="GD">Grenada</option><option value="GP">Guadeloupe</option><option value="GU">Guam</option><option value="GT">Guatemala</option><option value="GG">Guernsey</option><option value="GN">Guinea</option><option value="GW">Guinea-Bissau</option><option value="GY">Guyana</option><option value="HT">Haiti</option><option value="HM">Heard Island and Mcdonald Islands</option><option value="VA">Holy See (Vatican City State)</option><option value="HN">Honduras</option><option value="HK">Hong Kong</option><option value="HU">Hungary</option><option value="IS">Iceland</option><option value="IN">India</option><option value="ID">Indonesia</option><option value="IR">Iran, Islamic Republic of</option><option value="IQ">Iraq</option><option value="IE">Ireland</option><option value="IM">Isle of Man</option><option value="IL">Israel</option><option value="IT">Italy</option><option value="JM">Jamaica</option><option value="JP">Japan</option><option value="JE">Jersey</option><option value="JO">Jordan</option><option value="KZ">Kazakhstan</option><option value="KE">Kenya</option><option value="KI">Kiribati</option><option value="KP">Korea, Democratic People's Republic of</option><option value="KR">Korea, Republic of</option><option value="XK">Kosovo</option><option value="KW">Kuwait</option><option value="KG">Kyrgyzstan</option><option value="LA">Lao People's Democratic Republic</option><option value="LV">Latvia</option><option value="LB">Lebanon</option><option value="LS">Lesotho</option><option value="LR">Liberia</option><option value="LY">Libyan Arab Jamahiriya</option><option value="LI">Liechtenstein</option><option value="LT">Lithuania</option><option value="LU">Luxembourg</option><option value="MO">Macao</option><option value="MK">Macedonia, the Former Yugoslav Republic of</option><option value="MG">Madagascar</option><option value="MW">Malawi</option><option value="MY">Malaysia</option><option value="MV">Maldives</option><option value="ML">Mali</option><option value="MT">Malta</option><option value="MH">Marshall Islands</option><option value="MQ">Martinique</option><option value="MR">Mauritania</option><option value="MU">Mauritius</option><option value="YT">Mayotte</option><option value="MX">Mexico</option><option value="FM">Micronesia, Federated States of</option><option value="MD">Moldova, Republic of</option><option value="MC">Monaco</option><option value="MN">Mongolia</option><option value="ME">Montenegro</option><option value="MS">Montserrat</option><option value="MA">Morocco</option><option value="MZ">Mozambique</option><option value="MM">Myanmar</option><option value="NA">Namibia</option><option value="NR">Nauru</option><option value="NP">Nepal</option><option value="NL">Netherlands</option><option value="AN">Netherlands Antilles</option><option value="NC">New Caledonia</option><option value="NZ">New Zealand</option><option value="NI">Nicaragua</option><option value="NE">Niger</option><option value="NG">Nigeria</option><option value="NU">Niue</option><option value="NF">Norfolk Island</option><option value="MP">Northern Mariana Islands</option><option value="NO">Norway</option><option value="OM">Oman</option><option value="PK">Pakistan</option><option value="PW">Palau</option><option value="PS">Palestinian Territory, Occupied</option><option value="PA">Panama</option><option value="PG">Papua New Guinea</option><option value="PY">Paraguay</option><option value="PE">Peru</option><option value="PH">Philippines</option><option value="PN">Pitcairn</option><option value="PL">Poland</option><option value="PT">Portugal</option><option value="PR">Puerto Rico</option><option value="QA">Qatar</option><option value="RE">Reunion</option><option value="RO">Romania</option><option value="RU">Russian Federation</option><option value="RW">Rwanda</option><option value="BL">Saint Barthelemy</option><option value="SH">Saint Helena</option><option value="KN">Saint Kitts and Nevis</option><option value="LC">Saint Lucia</option><option value="MF">Saint Martin</option><option value="PM">Saint Pierre and Miquelon</option><option value="VC">Saint Vincent and the Grenadines</option><option value="WS">Samoa</option><option value="SM">San Marino</option><option value="ST">Sao Tome and Principe</option><option value="SA">Saudi Arabia</option><option value="SN">Senegal</option><option value="RS">Serbia</option><option value="CS">Serbia and Montenegro</option><option value="SC">Seychelles</option><option value="SL">Sierra Leone</option><option value="SG">Singapore</option><option value="SX">Sint Maarten</option><option value="SK">Slovakia</option><option value="SI">Slovenia</option><option value="SB">Solomon Islands</option><option value="SO">Somalia</option><option value="ZA">South Africa</option><option value="GS">South Georgia and the South Sandwich Islands</option><option value="SS">South Sudan</option><option value="ES">Spain</option><option value="LK">Sri Lanka</option><option value="SD">Sudan</option><option value="SR">Suriname</option><option value="SJ">Svalbard and Jan Mayen</option><option value="SZ">Swaziland</option><option value="SE">Sweden</option><option value="CH">Switzerland</option><option value="SY">Syrian Arab Republic</option><option value="TW">Taiwan, Province of China</option><option value="TJ">Tajikistan</option><option value="TZ">Tanzania, United Republic of</option><option value="TH">Thailand</option><option value="TL">Timor-Leste</option><option value="TG">Togo</option><option value="TK">Tokelau</option><option value="TO">Tonga</option><option value="TT">Trinidad and Tobago</option><option value="TN">Tunisia</option><option value="TR">Turkey</option><option value="TM">Turkmenistan</option><option value="TC">Turks and Caicos Islands</option><option value="TV">Tuvalu</option><option value="UG">Uganda</option><option value="UA">Ukraine</option><option value="AE">United Arab Emirates</option><option value="GB">United Kingdom</option><option value="US" selected="">United States</option><option value="UM">United States Minor Outlying Islands</option><option value="UY">Uruguay</option><option value="UZ">Uzbekistan</option><option value="VU">Vanuatu</option><option value="VE">Venezuela</option><option value="VN">Viet Nam</option><option value="VG">Virgin Islands, British</option><option value="VI">Virgin Islands, U.s.</option><option value="WF">Wallis and Futuna</option><option value="EH">Western Sahara</option><option value="YE">Yemen</option><option value="ZM">Zambia</option><option value="ZW">Zimbabwe</option></select>
 			</div>
-		
 			<div class="relative mb-2">
-				<label for="jansProfileURL" data-i18n="profile.linkedin_url" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
-				</label>
-				<input type="text" id="jansProfileURL" name="jansProfileURL" autofocus="" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
+			  <label for="jansTitle" data-i18n="profile.job_title" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
+			  </label>
+			  <input type="text" id="jansTitle" name="jansTitle" autofocus="" placeholder="Architect" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
+			</div>
+			<div class="relative mb-2">
+			  <label for="occupation" data-i18n="profile.I_am_an" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
+			  </label>
+			  <select type="text" id="jansRole" name="jansRole" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2"><option value="Architect" data-i18n="profile.architect"></option><option value="Developer" data-i18n="profile.developer"></option><option value="Researcher" data-i18n="profile.researcher"></option><option value="Student" data-i18n="profile.student"></option><option value="Other" data-i18n="profile.other"></option></select>
+			</div>
+			<div class="relative mb-2">
+			  <label for="jansProfileURL" data-i18n="profile.linkedin_url" class="label mt-2 ml-1 leading-tighter text-gray-600 text-base cursor-text">
+			  </label>
+			  <input type="text" id="jansProfileURL" name="jansProfileURL" autofocus="" class="w-full rounded px-3 border border-gray-300 pt-2 pb-2">
 			</div>
 			<div class="text-sm flex justify-center items-center">
 			  <button type="submit" data-callback="onSubmit" data-i18n="profile.submit" class="py-3 px-8 rounded text-white btn bg-green-500 hover:bg-green-600">
@@ -87,10 +73,13 @@
 		  </div>
 		</form>
 	  </div>
-  </div>
-
-
-
+	</div>
+  
+  
+  
+  
+  
+  
 </body>
 <style>
 	* {
